Split test suite into common and platform dependent parts.

90 files changed, 19 insertions, 4 deletions

diff --git a/run_tests.py b/run_tests.py
index 2e1f0bd39..039712fd7 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -16,6 +16,7 @@
 
 from glob import glob
 import os, subprocess, shutil, sys
+import environment
 
 test_build_dir = 'work area'
 install_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], 'install dir')
@@ -56,11 +57,22 @@ def run_test(testdir):
     if pi.returncode != 0:
         raise RuntimeError('Running install failed.')
 
-def run_tests():
-    tests = [t.split('/', 1)[1] for t in glob('test cases/*')]
+def gather_tests(testdir):
+    
+    tests = [t.split('/', 2)[2] for t in glob(os.path.join(testdir, '*'))]
     testlist = [(int(t.split()[0]), t) for t in tests]
     testlist.sort()
-    tests = [os.path.join('test cases', t[1]) for t in testlist]
+    tests = [os.path.join(testdir, t[1]) for t in testlist]
+    return tests
+
+def run_tests():
+    commontests = gather_tests('test cases/common')
+    if environment.is_osx():
+        platformtests = gather_tests('test cases/osx')
+    elif environment.is_windows():
+        platformtests = gather_tests('test cases/windows')
+    else:
+        platformtests = gather_tests('test cases/linuxlike')
     try:
         os.mkdir(test_build_dir)
     except OSError:
@@ -69,7 +81,10 @@ def run_tests():
         os.mkdir(install_dir)
     except OSError:
         pass
-    [run_test(t) for t in tests]
+    print('Running common tests.')
+    [run_test(t) for t in commontests]
+    print('Running platform dependent tetss')
+    [run_test(t) for t in platformtests]
 
 if __name__ == '__main__':
     os.chdir(os.path.split(__file__)[0])
diff --git a/test cases/1 trivial/meson.build b/test cases/common/1 trivial/meson.build
index 44bc48630..44bc48630 100644
--- a/test cases/1 trivial/meson.build
+++ b/test cases/common/1 trivial/meson.build
diff --git a/test cases/1 trivial/trivial.c b/test cases/common/1 trivial/trivial.c
index 5c2fa9bb6..5c2fa9bb6 100644
--- a/test cases/1 trivial/trivial.c
+++ b/test cases/common/1 trivial/trivial.c
diff --git a/test cases/10 man install/bar.2 b/test cases/common/10 man install/bar.2
index 9d82d7e15..9d82d7e15 100644
--- a/test cases/10 man install/bar.2
+++ b/test cases/common/10 man install/bar.2
diff --git a/test cases/10 man install/foo.1 b/test cases/common/10 man install/foo.1
index 647c0970c..647c0970c 100644
--- a/test cases/10 man install/foo.1
+++ b/test cases/common/10 man install/foo.1
diff --git a/test cases/10 man install/meson.build b/test cases/common/10 man install/meson.build
index 107f8b5aa..107f8b5aa 100644
--- a/test cases/10 man install/meson.build
+++ b/test cases/common/10 man install/meson.build
diff --git a/test cases/11 subdir/meson.build b/test cases/common/11 subdir/meson.build
index bda1f9040..bda1f9040 100644
--- a/test cases/11 subdir/meson.build
+++ b/test cases/common/11 subdir/meson.build
diff --git a/test cases/11 subdir/subdir/meson.build b/test cases/common/11 subdir/subdir/meson.build
index 5b399f080..5b399f080 100644
--- a/test cases/11 subdir/subdir/meson.build
+++ b/test cases/common/11 subdir/subdir/meson.build
diff --git a/test cases/11 subdir/subdir/prog.c b/test cases/common/11 subdir/subdir/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/11 subdir/subdir/prog.c
+++ b/test cases/common/11 subdir/subdir/prog.c
diff --git a/test cases/12 data/datafile.dat b/test cases/common/12 data/datafile.dat
index ff3104ba1..ff3104ba1 100644
--- a/test cases/12 data/datafile.dat
+++ b/test cases/common/12 data/datafile.dat
diff --git a/test cases/12 data/meson.build b/test cases/common/12 data/meson.build
index f529bacd2..f529bacd2 100644
--- a/test cases/12 data/meson.build
+++ b/test cases/common/12 data/meson.build
diff --git a/test cases/13 pch/meson.build b/test cases/common/13 pch/meson.build
index 9632cc58d..9632cc58d 100644
--- a/test cases/13 pch/meson.build
+++ b/test cases/common/13 pch/meson.build
diff --git a/test cases/13 pch/pch/prog.h b/test cases/common/13 pch/pch/prog.h
index 354499acd..354499acd 100644
--- a/test cases/13 pch/pch/prog.h
+++ b/test cases/common/13 pch/pch/prog.h
diff --git a/test cases/13 pch/prog.c b/test cases/common/13 pch/prog.c
index 995bb3f83..995bb3f83 100644
--- a/test cases/13 pch/prog.c
+++ b/test cases/common/13 pch/prog.c
diff --git a/test cases/14 cxx pch/meson.build b/test cases/common/14 cxx pch/meson.build
index 966979b16..966979b16 100644
--- a/test cases/14 cxx pch/meson.build
+++ b/test cases/common/14 cxx pch/meson.build
diff --git a/test cases/14 cxx pch/pch/prog.hh b/test cases/common/14 cxx pch/pch/prog.hh
index 751cc4a71..751cc4a71 100644
--- a/test cases/14 cxx pch/pch/prog.hh
+++ b/test cases/common/14 cxx pch/pch/prog.hh
diff --git a/test cases/14 cxx pch/prog.cc b/test cases/common/14 cxx pch/prog.cc
index 629d88077..629d88077 100644
--- a/test cases/14 cxx pch/prog.cc
+++ b/test cases/common/14 cxx pch/prog.cc
diff --git a/test cases/15 mixed pch/func.c b/test cases/common/15 mixed pch/func.c
index c02722e83..c02722e83 100644
--- a/test cases/15 mixed pch/func.c
+++ b/test cases/common/15 mixed pch/func.c
diff --git a/test cases/15 mixed pch/main.cc b/test cases/common/15 mixed pch/main.cc
index 44d049ed7..44d049ed7 100644
--- a/test cases/15 mixed pch/main.cc
+++ b/test cases/common/15 mixed pch/main.cc
diff --git a/test cases/15 mixed pch/meson.build b/test cases/common/15 mixed pch/meson.build
index 74380429e..74380429e 100644
--- a/test cases/15 mixed pch/meson.build
+++ b/test cases/common/15 mixed pch/meson.build
diff --git a/test cases/15 mixed pch/pch/func.h b/test cases/common/15 mixed pch/pch/func.h
index 354499acd..354499acd 100644
--- a/test cases/15 mixed pch/pch/func.h
+++ b/test cases/common/15 mixed pch/pch/func.h
diff --git a/test cases/15 mixed pch/pch/main.hh b/test cases/common/15 mixed pch/pch/main.hh
index 751cc4a71..751cc4a71 100644
--- a/test cases/15 mixed pch/pch/main.hh
+++ b/test cases/common/15 mixed pch/pch/main.hh
diff --git a/test cases/16 configure file/config.h.in b/test cases/common/16 configure file/config.h.in
index 74736c0e8..74736c0e8 100644
--- a/test cases/16 configure file/config.h.in
+++ b/test cases/common/16 configure file/config.h.in
diff --git a/test cases/16 configure file/meson.build b/test cases/common/16 configure file/meson.build
index 7fb3258c9..7fb3258c9 100644
--- a/test cases/16 configure file/meson.build
+++ b/test cases/common/16 configure file/meson.build
diff --git a/test cases/17 if/meson.build b/test cases/common/17 if/meson.build
index f163d74d2..f163d74d2 100644
--- a/test cases/17 if/meson.build
+++ b/test cases/common/17 if/meson.build
diff --git a/test cases/17 if/prog.c b/test cases/common/17 if/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/17 if/prog.c
+++ b/test cases/common/17 if/prog.c
diff --git a/test cases/18 else/meson.build b/test cases/common/18 else/meson.build
index 1555384b3..1555384b3 100644
--- a/test cases/18 else/meson.build
+++ b/test cases/common/18 else/meson.build
diff --git a/test cases/18 else/prog.c b/test cases/common/18 else/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/18 else/prog.c
+++ b/test cases/common/18 else/prog.c
diff --git a/test cases/19 comparison/meson.build b/test cases/common/19 comparison/meson.build
index 27f91229d..27f91229d 100644
--- a/test cases/19 comparison/meson.build
+++ b/test cases/common/19 comparison/meson.build
diff --git a/test cases/19 comparison/prog.c b/test cases/common/19 comparison/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/19 comparison/prog.c
+++ b/test cases/common/19 comparison/prog.c
diff --git a/test cases/2 cxx/meson.build b/test cases/common/2 cxx/meson.build
index 0352d0d93..0352d0d93 100644
--- a/test cases/2 cxx/meson.build
+++ b/test cases/common/2 cxx/meson.build
diff --git a/test cases/2 cxx/trivial.cc b/test cases/common/2 cxx/trivial.cc
index 84a584a60..84a584a60 100644
--- a/test cases/2 cxx/trivial.cc
+++ b/test cases/common/2 cxx/trivial.cc
diff --git a/test cases/20 array/func.c b/test cases/common/20 array/func.c
index 741237235..741237235 100644
--- a/test cases/20 array/func.c
+++ b/test cases/common/20 array/func.c
diff --git a/test cases/20 array/meson.build b/test cases/common/20 array/meson.build
index a3eac90b9..a3eac90b9 100644
--- a/test cases/20 array/meson.build
+++ b/test cases/common/20 array/meson.build
diff --git a/test cases/20 array/prog.c b/test cases/common/20 array/prog.c
index ad58a0b3a..ad58a0b3a 100644
--- a/test cases/20 array/prog.c
+++ b/test cases/common/20 array/prog.c
diff --git a/test cases/21 includedir/include/func.h b/test cases/common/21 includedir/include/func.h
index 29ebd0bb6..29ebd0bb6 100644
--- a/test cases/21 includedir/include/func.h
+++ b/test cases/common/21 includedir/include/func.h
diff --git a/test cases/21 includedir/meson.build b/test cases/common/21 includedir/meson.build
index 17eec0e57..17eec0e57 100644
--- a/test cases/21 includedir/meson.build
+++ b/test cases/common/21 includedir/meson.build
diff --git a/test cases/21 includedir/src/func.c b/test cases/common/21 includedir/src/func.c
index 193edbbc9..193edbbc9 100644
--- a/test cases/21 includedir/src/func.c
+++ b/test cases/common/21 includedir/src/func.c
diff --git a/test cases/21 includedir/src/meson.build b/test cases/common/21 includedir/src/meson.build
index 5eaeab683..5eaeab683 100644
--- a/test cases/21 includedir/src/meson.build
+++ b/test cases/common/21 includedir/src/meson.build
diff --git a/test cases/21 includedir/src/prog.c b/test cases/common/21 includedir/src/prog.c
index c26b9b3c3..c26b9b3c3 100644
--- a/test cases/21 includedir/src/prog.c
+++ b/test cases/common/21 includedir/src/prog.c
diff --git a/test cases/22 header in file list/header.h b/test cases/common/22 header in file list/header.h
index 354499acd..354499acd 100644
--- a/test cases/22 header in file list/header.h
+++ b/test cases/common/22 header in file list/header.h
diff --git a/test cases/22 header in file list/meson.build b/test cases/common/22 header in file list/meson.build
index 09c302c69..09c302c69 100644
--- a/test cases/22 header in file list/meson.build
+++ b/test cases/common/22 header in file list/meson.build
diff --git a/test cases/22 header in file list/prog.c b/test cases/common/22 header in file list/prog.c
index 0314ff17b..0314ff17b 100644
--- a/test cases/22 header in file list/prog.c
+++ b/test cases/common/22 header in file list/prog.c
diff --git a/test cases/23 global arg/meson.build b/test cases/common/23 global arg/meson.build
index 7ab6d448a..7ab6d448a 100644
--- a/test cases/23 global arg/meson.build
+++ b/test cases/common/23 global arg/meson.build
diff --git a/test cases/23 global arg/prog.c b/test cases/common/23 global arg/prog.c
index 2db6212d7..2db6212d7 100644
--- a/test cases/23 global arg/prog.c
+++ b/test cases/common/23 global arg/prog.c
diff --git a/test cases/23 global arg/prog.cc b/test cases/common/23 global arg/prog.cc
index b881645d9..b881645d9 100644
--- a/test cases/23 global arg/prog.cc
+++ b/test cases/common/23 global arg/prog.cc
diff --git a/test cases/24 target arg/func.c b/test cases/common/24 target arg/func.c
index d8a509a50..d8a509a50 100644
--- a/test cases/24 target arg/func.c
+++ b/test cases/common/24 target arg/func.c
diff --git a/test cases/24 target arg/meson.build b/test cases/common/24 target arg/meson.build
index a9ba17b4e..a9ba17b4e 100644
--- a/test cases/24 target arg/meson.build
+++ b/test cases/common/24 target arg/meson.build
diff --git a/test cases/24 target arg/prog.cc b/test cases/common/24 target arg/prog.cc
index cc36ae079..cc36ae079 100644
--- a/test cases/24 target arg/prog.cc
+++ b/test cases/common/24 target arg/prog.cc
diff --git a/test cases/25 numbers/meson.build b/test cases/common/25 numbers/meson.build
index ea965b031..ea965b031 100644
--- a/test cases/25 numbers/meson.build
+++ b/test cases/common/25 numbers/meson.build
diff --git a/test cases/25 numbers/prog.c b/test cases/common/25 numbers/prog.c
index d4c7872e1..d4c7872e1 100644
--- a/test cases/25 numbers/prog.c
+++ b/test cases/common/25 numbers/prog.c
diff --git a/test cases/26 endian/meson.build b/test cases/common/26 endian/meson.build
index 54bdda264..54bdda264 100644
--- a/test cases/26 endian/meson.build
+++ b/test cases/common/26 endian/meson.build
diff --git a/test cases/26 endian/prog.c b/test cases/common/26 endian/prog.c
index b2a10d081..b2a10d081 100644
--- a/test cases/26 endian/prog.c
+++ b/test cases/common/26 endian/prog.c
diff --git a/test cases/27 library versions/lib.c b/test cases/common/27 library versions/lib.c
index 67b6f4d00..67b6f4d00 100644
--- a/test cases/27 library versions/lib.c
+++ b/test cases/common/27 library versions/lib.c
diff --git a/test cases/27 library versions/meson.build b/test cases/common/27 library versions/meson.build
index cebcd64c6..cebcd64c6 100644
--- a/test cases/27 library versions/meson.build
+++ b/test cases/common/27 library versions/meson.build
diff --git a/test cases/28 config subdir/include/config.h.in b/test cases/common/28 config subdir/include/config.h.in
index 4c3c62dbe..4c3c62dbe 100644
--- a/test cases/28 config subdir/include/config.h.in
+++ b/test cases/common/28 config subdir/include/config.h.in
diff --git a/test cases/28 config subdir/include/meson.build b/test cases/common/28 config subdir/include/meson.build
index 8fb3282ed..8fb3282ed 100644
--- a/test cases/28 config subdir/include/meson.build
+++ b/test cases/common/28 config subdir/include/meson.build
diff --git a/test cases/28 config subdir/meson.build b/test cases/common/28 config subdir/meson.build
index 25f53dbfd..25f53dbfd 100644
--- a/test cases/28 config subdir/meson.build
+++ b/test cases/common/28 config subdir/meson.build
diff --git a/test cases/28 config subdir/src/meson.build b/test cases/common/28 config subdir/src/meson.build
index 9908c5801..9908c5801 100644
--- a/test cases/28 config subdir/src/meson.build
+++ b/test cases/common/28 config subdir/src/meson.build
diff --git a/test cases/28 config subdir/src/prog.c b/test cases/common/28 config subdir/src/prog.c
index 4c03c2024..4c03c2024 100644
--- a/test cases/28 config subdir/src/prog.c
+++ b/test cases/common/28 config subdir/src/prog.c
diff --git a/test cases/30 pipeline/input_src.dat b/test cases/common/29 pipeline/input_src.dat
index 741237235..741237235 100644
--- a/test cases/30 pipeline/input_src.dat
+++ b/test cases/common/29 pipeline/input_src.dat
diff --git a/test cases/30 pipeline/meson.build b/test cases/common/29 pipeline/meson.build
index 96de345eb..96de345eb 100644
--- a/test cases/30 pipeline/meson.build
+++ b/test cases/common/29 pipeline/meson.build
diff --git a/test cases/30 pipeline/prog.c b/test cases/common/29 pipeline/prog.c
index 175a90dde..175a90dde 100644
--- a/test cases/30 pipeline/prog.c
+++ b/test cases/common/29 pipeline/prog.c
diff --git a/test cases/30 pipeline/srcgen.c b/test cases/common/29 pipeline/srcgen.c
index c4e412bef..c4e412bef 100644
--- a/test cases/30 pipeline/srcgen.c
+++ b/test cases/common/29 pipeline/srcgen.c
diff --git a/test cases/3 static/libfile.c b/test cases/common/3 static/libfile.c
index 80a427b4a..80a427b4a 100644
--- a/test cases/3 static/libfile.c
+++ b/test cases/common/3 static/libfile.c
diff --git a/test cases/3 static/meson.build b/test cases/common/3 static/meson.build
index fd33e1c3e..fd33e1c3e 100644
--- a/test cases/3 static/meson.build
+++ b/test cases/common/3 static/meson.build
diff --git a/test cases/31 generate header/input_src.dat b/test cases/common/30 pipeline/input_src.dat
index 354499acd..354499acd 100644
--- a/test cases/31 generate header/input_src.dat
+++ b/test cases/common/30 pipeline/input_src.dat
diff --git a/test cases/31 generate header/meson.build b/test cases/common/30 pipeline/meson.build
index 1948eeb6c..1948eeb6c 100644
--- a/test cases/31 generate header/meson.build
+++ b/test cases/common/30 pipeline/meson.build
diff --git a/test cases/31 generate header/prog.c b/test cases/common/30 pipeline/prog.c
index 34294816b..34294816b 100644
--- a/test cases/31 generate header/prog.c
+++ b/test cases/common/30 pipeline/prog.c
diff --git a/test cases/31 generate header/srcgen.c b/test cases/common/30 pipeline/srcgen.c
index c4e412bef..c4e412bef 100644
--- a/test cases/31 generate header/srcgen.c
+++ b/test cases/common/30 pipeline/srcgen.c
diff --git a/test cases/4 shared/libfile.c b/test cases/common/4 shared/libfile.c
index 80a427b4a..80a427b4a 100644
--- a/test cases/4 shared/libfile.c
+++ b/test cases/common/4 shared/libfile.c
diff --git a/test cases/4 shared/meson.build b/test cases/common/4 shared/meson.build
index a148272f2..a148272f2 100644
--- a/test cases/4 shared/meson.build
+++ b/test cases/common/4 shared/meson.build
diff --git a/test cases/5 linkstatic/libfile.c b/test cases/common/5 linkstatic/libfile.c
index 6f1c172d6..6f1c172d6 100644
--- a/test cases/5 linkstatic/libfile.c
+++ b/test cases/common/5 linkstatic/libfile.c
diff --git a/test cases/5 linkstatic/main.c b/test cases/common/5 linkstatic/main.c
index 8aadb0c7c..8aadb0c7c 100644
--- a/test cases/5 linkstatic/main.c
+++ b/test cases/common/5 linkstatic/main.c
diff --git a/test cases/5 linkstatic/meson.build b/test cases/common/5 linkstatic/meson.build
index 8c8aebcfa..8c8aebcfa 100644
--- a/test cases/5 linkstatic/meson.build
+++ b/test cases/common/5 linkstatic/meson.build
diff --git a/test cases/6 linkshared/libfile.c b/test cases/common/6 linkshared/libfile.c
index 6f1c172d6..6f1c172d6 100644
--- a/test cases/6 linkshared/libfile.c
+++ b/test cases/common/6 linkshared/libfile.c
diff --git a/test cases/6 linkshared/main.c b/test cases/common/6 linkshared/main.c
index 8aadb0c7c..8aadb0c7c 100644
--- a/test cases/6 linkshared/main.c
+++ b/test cases/common/6 linkshared/main.c
diff --git a/test cases/6 linkshared/meson.build b/test cases/common/6 linkshared/meson.build
index 3e646f458..3e646f458 100644
--- a/test cases/6 linkshared/meson.build
+++ b/test cases/common/6 linkshared/meson.build
diff --git a/test cases/7 mixed/func.c b/test cases/common/7 mixed/func.c
index 9019a81d1..9019a81d1 100644
--- a/test cases/7 mixed/func.c
+++ b/test cases/common/7 mixed/func.c
diff --git a/test cases/7 mixed/main.cc b/test cases/common/7 mixed/main.cc
index f165346a4..f165346a4 100644
--- a/test cases/7 mixed/main.cc
+++ b/test cases/common/7 mixed/main.cc
diff --git a/test cases/7 mixed/meson.build b/test cases/common/7 mixed/meson.build
index 3e3250898..3e3250898 100644
--- a/test cases/7 mixed/meson.build
+++ b/test cases/common/7 mixed/meson.build
diff --git a/test cases/8 install/meson.build b/test cases/common/8 install/meson.build
index 677a2eeaa..677a2eeaa 100644
--- a/test cases/8 install/meson.build
+++ b/test cases/common/8 install/meson.build
diff --git a/test cases/8 install/prog.c b/test cases/common/8 install/prog.c
index 11b7fad8e..11b7fad8e 100644
--- a/test cases/8 install/prog.c
+++ b/test cases/common/8 install/prog.c
diff --git a/test cases/8 install/shar.c b/test cases/common/8 install/shar.c
index 9c816a625..9c816a625 100644
--- a/test cases/8 install/shar.c
+++ b/test cases/common/8 install/shar.c
diff --git a/test cases/8 install/stat.c b/test cases/common/8 install/stat.c
index fa76a658f..fa76a658f 100644
--- a/test cases/8 install/stat.c
+++ b/test cases/common/8 install/stat.c
diff --git a/test cases/9 header install/meson.build b/test cases/common/9 header install/meson.build
index 6e54489a3..6e54489a3 100644
--- a/test cases/9 header install/meson.build
+++ b/test cases/common/9 header install/meson.build
diff --git a/test cases/9 header install/rootdir.h b/test cases/common/9 header install/rootdir.h
index 72fb13220..72fb13220 100644
--- a/test cases/9 header install/rootdir.h
+++ b/test cases/common/9 header install/rootdir.h
diff --git a/test cases/9 header install/subdir.h b/test cases/common/9 header install/subdir.h
index 17f768e58..17f768e58 100644
--- a/test cases/9 header install/subdir.h
+++ b/test cases/common/9 header install/subdir.h
diff --git a/test cases/29 external dep/meson.build b/test cases/linuxlike/1 pkg-config/meson.build
index 6f6069886..6f6069886 100644
--- a/test cases/29 external dep/meson.build
+++ b/test cases/linuxlike/1 pkg-config/meson.build
diff --git a/test cases/29 external dep/prog.c b/test cases/linuxlike/1 pkg-config/prog.c
index cea986d50..cea986d50 100644
--- a/test cases/29 external dep/prog.c
+++ b/test cases/linuxlike/1 pkg-config/prog.c