From 4b17961dd4443a08eaf15a4a37d3355a9db9c604 Mon Sep 17 00:00:00 2001 From: pierre Date: Wed, 10 Aug 2016 16:10:25 +0000 Subject: [PATCH] * Skip some tests for msdos git-svn-id: trunk@34266 - --- tests/test/library/tlib1a.pp | 1 + tests/test/library/tlib1b.pp | 1 + tests/test/library/tlib1c.pp | 1 + tests/test/library/tlib1d.pp | 1 + tests/test/tlib1a.pp | 2 +- tests/test/tlib1b.pp | 2 +- tests/test/tlib2a.pp | 1 + tests/test/tlib2b.pp | 1 + tests/test/tlibrary1.pp | 2 +- tests/test/tlibrary2.pp | 2 +- tests/test/tlibrary3.pp | 2 +- tests/test/tmt1.pp | 2 +- tests/test/tweaklib1.pp | 1 + tests/test/tweaklib2.pp | 1 + tests/test/tweaklib3.pp | 1 - tests/test/units/sharemem/libtest.pp | 1 + 16 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tests/test/library/tlib1a.pp b/tests/test/library/tlib1a.pp index 15cc3f938f..47c1120814 100644 --- a/tests/test/library/tlib1a.pp +++ b/tests/test/library/tlib1a.pp @@ -1,4 +1,5 @@ { %target=win32,win64 } +{ %skiptarget=$nosharedlibb } { %needlibrary } { %norun } { %neededafter } diff --git a/tests/test/library/tlib1b.pp b/tests/test/library/tlib1b.pp index e90e331114..eb247aa483 100644 --- a/tests/test/library/tlib1b.pp +++ b/tests/test/library/tlib1b.pp @@ -1,4 +1,5 @@ { %target=win32,win64 } +{ %skiptarget=$nosharedlib } { %needlibrary } { %norun } { %neededafter } diff --git a/tests/test/library/tlib1c.pp b/tests/test/library/tlib1c.pp index b145606881..27ca277913 100644 --- a/tests/test/library/tlib1c.pp +++ b/tests/test/library/tlib1c.pp @@ -1,4 +1,5 @@ { %target=win32,win64 } +{ %skiptarget=$nosharedlib } { %needlibrary } { Checks that the two functions with the same exported name 'p' diff --git a/tests/test/library/tlib1d.pp b/tests/test/library/tlib1d.pp index 60202842f8..4c2f667b88 100644 --- a/tests/test/library/tlib1d.pp +++ b/tests/test/library/tlib1d.pp @@ -1,4 +1,5 @@ { %target=win32,win64 } +{ %skiptarget=$nosharedlib } { %needlibrary } diff --git a/tests/test/tlib1a.pp b/tests/test/tlib1a.pp index c0217141a6..efa693551a 100644 --- a/tests/test/tlib1a.pp +++ b/tests/test/tlib1a.pp @@ -1,4 +1,4 @@ -{ %skiptarget=go32v2,os2 } +{ %skiptarget=$nosharedlib,os2 } { %opt=-gl -O- win32,win64%-WN } { %delopt=-XX } { %norun } diff --git a/tests/test/tlib1b.pp b/tests/test/tlib1b.pp index 65c0cb5db2..7d61e0935b 100644 --- a/tests/test/tlib1b.pp +++ b/tests/test/tlib1b.pp @@ -1,4 +1,4 @@ -{ %skiptarget=go32v2,os2 } +{ %skiptarget=$nosharedlib,os2 } { %opt=-gl -O- } { %needlibrary } { %delfiles=tlib1a } diff --git a/tests/test/tlib2a.pp b/tests/test/tlib2a.pp index 892f1f0dda..6e72b43de2 100644 --- a/tests/test/tlib2a.pp +++ b/tests/test/tlib2a.pp @@ -1,4 +1,5 @@ { %target=linux,android } +{ %skiptarget=$nosharedlib } { %norun } library lib2a; diff --git a/tests/test/tlib2b.pp b/tests/test/tlib2b.pp index 9513a6ed94..df4544e4e3 100644 --- a/tests/test/tlib2b.pp +++ b/tests/test/tlib2b.pp @@ -1,4 +1,5 @@ { %target=linux,android } +{ %skiptarget=$nosharedlib } { %needlibrary } { %delfiles=tlib2a } diff --git a/tests/test/tlibrary1.pp b/tests/test/tlibrary1.pp index a564ce13c7..16bc0e196c 100644 --- a/tests/test/tlibrary1.pp +++ b/tests/test/tlibrary1.pp @@ -1,5 +1,5 @@ { %NORUN } -{ %SKIPTARGET=macos,go32v2 } +{ %SKIPTARGET=macos,$nosharedlib } {$ifdef darwin} {$PIC+} diff --git a/tests/test/tlibrary2.pp b/tests/test/tlibrary2.pp index 361d0b2375..88fbe202f5 100644 --- a/tests/test/tlibrary2.pp +++ b/tests/test/tlibrary2.pp @@ -1,4 +1,4 @@ -{ %skiptarget=go32v2 } +{ %skiptarget=$nosharedlib } { %NEEDLIBRARY } { %delfiles=tlibrary1 } diff --git a/tests/test/tlibrary3.pp b/tests/test/tlibrary3.pp index 0b929663c7..8065a319ed 100644 --- a/tests/test/tlibrary3.pp +++ b/tests/test/tlibrary3.pp @@ -1,5 +1,5 @@ { %NORUN } -{ %SKIPTARGET=macos, go32v2, win64 } +{ %SKIPTARGET=macos, $nosharedlib, win64 } { %delfiles=tlibrary3 } {$ifdef darwin} diff --git a/tests/test/tmt1.pp b/tests/test/tmt1.pp index 418369fe65..424e47edf9 100644 --- a/tests/test/tmt1.pp +++ b/tests/test/tmt1.pp @@ -1,4 +1,4 @@ -{ %skiptarget=go32v2 } +{ %skiptarget=$nothread } { %version=1.1 } {$mode objfpc} diff --git a/tests/test/tweaklib1.pp b/tests/test/tweaklib1.pp index a2ecfee6cf..fde3b74f83 100644 --- a/tests/test/tweaklib1.pp +++ b/tests/test/tweaklib1.pp @@ -1,4 +1,5 @@ { %norun } +{ %skiptarget=$nosharedlib } {$ifdef CPUX86_64} {$ifndef WINDOWS} diff --git a/tests/test/tweaklib2.pp b/tests/test/tweaklib2.pp index e03f195f71..5dc9d3b2fc 100644 --- a/tests/test/tweaklib2.pp +++ b/tests/test/tweaklib2.pp @@ -1,4 +1,5 @@ { %NEEDLIBRARY } +{ %skiptarget=$nosharedlib } { %delfiles=tweaklib1 } {$ifdef mswindows} diff --git a/tests/test/tweaklib3.pp b/tests/test/tweaklib3.pp index 7fe096f568..102e6e0c93 100644 --- a/tests/test/tweaklib3.pp +++ b/tests/test/tweaklib3.pp @@ -1,5 +1,4 @@ { %norun } - { %target=darwin } { %opt=-olibtweaklib1.dylib } diff --git a/tests/test/units/sharemem/libtest.pp b/tests/test/units/sharemem/libtest.pp index 118d364e18..7de920813e 100644 --- a/tests/test/units/sharemem/libtest.pp +++ b/tests/test/units/sharemem/libtest.pp @@ -1,4 +1,5 @@ { %target=win32,win64,wince} +{ %skiptarget=$nosharedlib } library LibTest; uses