From 1105ba3afdf2f533782c5cc5ee984745989a1914 Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Sat, 7 Apr 2018 16:13:59 +0200 Subject: [fixup]: rename test after rebase --- run_unittests.py | 2 +- test cases/unit/26 forcefallback/meson.build | 8 -------- .../26 forcefallback/subprojects/notzlib/meson.build | 7 ------- .../26 forcefallback/subprojects/notzlib/notzlib.c | 6 ------ .../26 forcefallback/subprojects/notzlib/notzlib.h | 18 ------------------ test cases/unit/26 forcefallback/test_not_zlib.c | 8 -------- test cases/unit/27 forcefallback/meson.build | 8 ++++++++ .../27 forcefallback/subprojects/notzlib/meson.build | 7 +++++++ .../27 forcefallback/subprojects/notzlib/notzlib.c | 6 ++++++ .../27 forcefallback/subprojects/notzlib/notzlib.h | 18 ++++++++++++++++++ test cases/unit/27 forcefallback/test_not_zlib.c | 8 ++++++++ 11 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 test cases/unit/26 forcefallback/meson.build delete mode 100644 test cases/unit/26 forcefallback/subprojects/notzlib/meson.build delete mode 100644 test cases/unit/26 forcefallback/subprojects/notzlib/notzlib.c delete mode 100644 test cases/unit/26 forcefallback/subprojects/notzlib/notzlib.h delete mode 100644 test cases/unit/26 forcefallback/test_not_zlib.c create mode 100644 test cases/unit/27 forcefallback/meson.build create mode 100644 test cases/unit/27 forcefallback/subprojects/notzlib/meson.build create mode 100644 test cases/unit/27 forcefallback/subprojects/notzlib/notzlib.c create mode 100644 test cases/unit/27 forcefallback/subprojects/notzlib/notzlib.h create mode 100644 test cases/unit/27 forcefallback/test_not_zlib.c diff --git a/run_unittests.py b/run_unittests.py index 3179f9b..4f688cd 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -951,7 +951,7 @@ class AllPlatformTests(BasePlatformTests): self.assertPathDoesNotExist(exename) def test_forcefallback(self): - testdir = os.path.join(self.unit_test_dir, '26 forcefallback') + testdir = os.path.join(self.unit_test_dir, '27 forcefallback') self.init(testdir, ['--wrap-mode=forcefallback']) self.build() self.run_tests() diff --git a/test cases/unit/26 forcefallback/meson.build b/test cases/unit/26 forcefallback/meson.build deleted file mode 100644 index e6a90ea..0000000 --- a/test cases/unit/26 forcefallback/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -project('mainproj', 'c', - default_options : ['wrap_mode=forcefallback']) - -zlib_dep = dependency('zlib', fallback: ['notzlib', 'zlib_dep']) - -test_not_zlib = executable('test_not_zlib', ['test_not_zlib.c'], dependencies: [zlib_dep]) - -test('test_not_zlib', test_not_zlib) diff --git a/test cases/unit/26 forcefallback/subprojects/notzlib/meson.build b/test cases/unit/26 forcefallback/subprojects/notzlib/meson.build deleted file mode 100644 index 254a136..0000000 --- a/test cases/unit/26 forcefallback/subprojects/notzlib/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -project('notzlib', 'c') - -notzlib_sources = ['notzlib.c'] - -notzlib = library('notzlib', notzlib_sources) - -zlib_dep = declare_dependency(link_with: notzlib, include_directories: include_directories(['.'])) diff --git a/test cases/unit/26 forcefallback/subprojects/notzlib/notzlib.c b/test cases/unit/26 forcefallback/subprojects/notzlib/notzlib.c deleted file mode 100644 index c3b6bf9..0000000 --- a/test cases/unit/26 forcefallback/subprojects/notzlib/notzlib.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "notzlib.h" - -int not_a_zlib_function (void) -{ - return 42; -} diff --git a/test cases/unit/26 forcefallback/subprojects/notzlib/notzlib.h b/test cases/unit/26 forcefallback/subprojects/notzlib/notzlib.h deleted file mode 100644 index 695921d..0000000 --- a/test cases/unit/26 forcefallback/subprojects/notzlib/notzlib.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#if defined _WIN32 || defined __CYGWIN__ -#if defined BUILDING_DLL - #define DLL_PUBLIC __declspec(dllexport) -#else - #define DLL_PUBLIC __declspec(dllimport) -#endif -#else - #if defined __GNUC__ - #define DLL_PUBLIC __attribute__ ((visibility("default"))) - #else - #pragma message ("Compiler does not support symbol visibility.") - #define DLL_PUBLIC - #endif -#endif - -int DLL_PUBLIC not_a_zlib_function (void); diff --git a/test cases/unit/26 forcefallback/test_not_zlib.c b/test cases/unit/26 forcefallback/test_not_zlib.c deleted file mode 100644 index 36256af..0000000 --- a/test cases/unit/26 forcefallback/test_not_zlib.c +++ /dev/null @@ -1,8 +0,0 @@ -#include - -int main (int ac, char **av) -{ - if (not_a_zlib_function () != 42) - return 1; - return 0; -} diff --git a/test cases/unit/27 forcefallback/meson.build b/test cases/unit/27 forcefallback/meson.build new file mode 100644 index 0000000..e6a90ea --- /dev/null +++ b/test cases/unit/27 forcefallback/meson.build @@ -0,0 +1,8 @@ +project('mainproj', 'c', + default_options : ['wrap_mode=forcefallback']) + +zlib_dep = dependency('zlib', fallback: ['notzlib', 'zlib_dep']) + +test_not_zlib = executable('test_not_zlib', ['test_not_zlib.c'], dependencies: [zlib_dep]) + +test('test_not_zlib', test_not_zlib) diff --git a/test cases/unit/27 forcefallback/subprojects/notzlib/meson.build b/test cases/unit/27 forcefallback/subprojects/notzlib/meson.build new file mode 100644 index 0000000..254a136 --- /dev/null +++ b/test cases/unit/27 forcefallback/subprojects/notzlib/meson.build @@ -0,0 +1,7 @@ +project('notzlib', 'c') + +notzlib_sources = ['notzlib.c'] + +notzlib = library('notzlib', notzlib_sources) + +zlib_dep = declare_dependency(link_with: notzlib, include_directories: include_directories(['.'])) diff --git a/test cases/unit/27 forcefallback/subprojects/notzlib/notzlib.c b/test cases/unit/27 forcefallback/subprojects/notzlib/notzlib.c new file mode 100644 index 0000000..c3b6bf9 --- /dev/null +++ b/test cases/unit/27 forcefallback/subprojects/notzlib/notzlib.c @@ -0,0 +1,6 @@ +#include "notzlib.h" + +int not_a_zlib_function (void) +{ + return 42; +} diff --git a/test cases/unit/27 forcefallback/subprojects/notzlib/notzlib.h b/test cases/unit/27 forcefallback/subprojects/notzlib/notzlib.h new file mode 100644 index 0000000..695921d --- /dev/null +++ b/test cases/unit/27 forcefallback/subprojects/notzlib/notzlib.h @@ -0,0 +1,18 @@ +#pragma once + +#if defined _WIN32 || defined __CYGWIN__ +#if defined BUILDING_DLL + #define DLL_PUBLIC __declspec(dllexport) +#else + #define DLL_PUBLIC __declspec(dllimport) +#endif +#else + #if defined __GNUC__ + #define DLL_PUBLIC __attribute__ ((visibility("default"))) + #else + #pragma message ("Compiler does not support symbol visibility.") + #define DLL_PUBLIC + #endif +#endif + +int DLL_PUBLIC not_a_zlib_function (void); diff --git a/test cases/unit/27 forcefallback/test_not_zlib.c b/test cases/unit/27 forcefallback/test_not_zlib.c new file mode 100644 index 0000000..36256af --- /dev/null +++ b/test cases/unit/27 forcefallback/test_not_zlib.c @@ -0,0 +1,8 @@ +#include + +int main (int ac, char **av) +{ + if (not_a_zlib_function () != 42) + return 1; + return 0; +} -- cgit v1.1