From 941d2c273ae8f43f9346480e095a7ebaadb76295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?= Date: Wed, 25 Jul 2018 22:20:56 -0700 Subject: Move test from common to unit. When I initially added the test the intention was to use it from run_unittests.py only, but I placed it in the wrong directory. --- run_unittests.py | 2 +- test cases/common/206 dep order/lib1.c | 0 test cases/common/206 dep order/lib2.c | 0 test cases/common/206 dep order/meson.build | 8 -------- test cases/common/206 dep order/myexe.c | 3 --- test cases/unit/36 dep order/lib1.c | 0 test cases/unit/36 dep order/lib2.c | 0 test cases/unit/36 dep order/meson.build | 8 ++++++++ test cases/unit/36 dep order/myexe.c | 3 +++ 9 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 test cases/common/206 dep order/lib1.c delete mode 100644 test cases/common/206 dep order/lib2.c delete mode 100644 test cases/common/206 dep order/meson.build delete mode 100644 test cases/common/206 dep order/myexe.c create mode 100644 test cases/unit/36 dep order/lib1.c create mode 100644 test cases/unit/36 dep order/lib2.c create mode 100644 test cases/unit/36 dep order/meson.build create mode 100644 test cases/unit/36 dep order/myexe.c diff --git a/run_unittests.py b/run_unittests.py index 1e5ce99..66d663a 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -3591,7 +3591,7 @@ endian = 'little' ''' Test that the dependencies are always listed in a deterministic order. ''' - testdir = os.path.join(self.common_test_dir, '206 dep order') + testdir = os.path.join(self.unit_test_dir, '36 dep order') self.init(testdir) with open(os.path.join(self.builddir, 'build.ninja')) as bfile: for line in bfile: diff --git a/test cases/common/206 dep order/lib1.c b/test cases/common/206 dep order/lib1.c deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/common/206 dep order/lib2.c b/test cases/common/206 dep order/lib2.c deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/common/206 dep order/meson.build b/test cases/common/206 dep order/meson.build deleted file mode 100644 index 17cf9df..0000000 --- a/test cases/common/206 dep order/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -project('myexe', 'c') - -lib1 = static_library('lib1', 'lib1.c') -lib2 = static_library('lib2', 'lib2.c') - -executable('myexe', - 'myexe.c', - link_with: [lib1, lib2]) diff --git a/test cases/common/206 dep order/myexe.c b/test cases/common/206 dep order/myexe.c deleted file mode 100644 index 8f4c045..0000000 --- a/test cases/common/206 dep order/myexe.c +++ /dev/null @@ -1,3 +0,0 @@ -int main(int ac, char** av) { - return 0; -} diff --git a/test cases/unit/36 dep order/lib1.c b/test cases/unit/36 dep order/lib1.c new file mode 100644 index 0000000..e69de29 diff --git a/test cases/unit/36 dep order/lib2.c b/test cases/unit/36 dep order/lib2.c new file mode 100644 index 0000000..e69de29 diff --git a/test cases/unit/36 dep order/meson.build b/test cases/unit/36 dep order/meson.build new file mode 100644 index 0000000..17cf9df --- /dev/null +++ b/test cases/unit/36 dep order/meson.build @@ -0,0 +1,8 @@ +project('myexe', 'c') + +lib1 = static_library('lib1', 'lib1.c') +lib2 = static_library('lib2', 'lib2.c') + +executable('myexe', + 'myexe.c', + link_with: [lib1, lib2]) diff --git a/test cases/unit/36 dep order/myexe.c b/test cases/unit/36 dep order/myexe.c new file mode 100644 index 0000000..8f4c045 --- /dev/null +++ b/test cases/unit/36 dep order/myexe.c @@ -0,0 +1,3 @@ +int main(int ac, char** av) { + return 0; +} -- cgit v1.1