diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-11-02 08:41:02 -0400 |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-11-02 08:41:02 -0400 |
| commit | 3b110be5bfe7a5fa628229da94e12aa643f3d5d2 (patch) | |
| tree | d9a789eef5d460560d5078083fa5226df679542b | |
| parent | f6df22b414bca8bbf18ddc1aff2e11f9cf15df03 (diff) | |
| download | scons-3b110be5bfe7a5fa628229da94e12aa643f3d5d2.tar.gz | |
Fix tests for previous commit (bug 2903) on Windows.
| -rw-r--r-- | test/Libs/SharedLibrary-update-deps.py | 2 | ||||
| -rw-r--r-- | test/Libs/bug2903/SConstruct | 2 | ||||
| -rw-r--r-- | test/Libs/bug2903/SConstruct-libs | 3 | ||||
| -rw-r--r-- | test/Libs/bug2903/lib.c | 3 | ||||
| -rw-r--r-- | test/Libs/bug2903/main.c | 3 |
5 files changed, 10 insertions, 3 deletions
diff --git a/test/Libs/SharedLibrary-update-deps.py b/test/Libs/SharedLibrary-update-deps.py index e8ec2abb..5394bc7a 100644 --- a/test/Libs/SharedLibrary-update-deps.py +++ b/test/Libs/SharedLibrary-update-deps.py @@ -58,7 +58,7 @@ else: test.run(arguments=['libname=foo', extraflags]) test.must_not_contain_any_line(test.stdout(), ["is up to date"]) -test.run(arguments=['libname=foo', extraflags]) +test.run(arguments=['libname=foo', extraflags, '--debug=explain']) test.must_contain_all_lines(test.stdout(), ["is up to date"]) test.pass_test() diff --git a/test/Libs/bug2903/SConstruct b/test/Libs/bug2903/SConstruct index f7b66a84..12919cef 100644 --- a/test/Libs/bug2903/SConstruct +++ b/test/Libs/bug2903/SConstruct @@ -7,7 +7,7 @@ # that already.) env=Environment() libname=ARGUMENTS.get('libname', 'foo') -env['SHLINKCOM'] = env['SHLINKCOM'] + ' $EXTRA_SHLINKFLAGS' +env.Append(SHLINKFLAGS=' $EXTRA_SHLINKFLAGS') shlinkflags=ARGUMENTS.get('shlinkflags', '') env.SharedLibrary('myshared', ['main.c'], LIBS=[libname], LIBPATH='.', EXTRA_SHLINKFLAGS=shlinkflags) diff --git a/test/Libs/bug2903/SConstruct-libs b/test/Libs/bug2903/SConstruct-libs index 3f59f9c5..f7cc35db 100644 --- a/test/Libs/bug2903/SConstruct-libs +++ b/test/Libs/bug2903/SConstruct-libs @@ -1,3 +1,4 @@ env=Environment() libfoo = env.SharedLibrary('foo', 'lib.c') -env.InstallAs('${SHLIBPREFIX}bar${SHLIBSUFFIX}', libfoo)
\ No newline at end of file +env.InstallAs('${SHLIBPREFIX}bar${SHLIBSUFFIX}', libfoo[0]) +env.InstallAs('${LIBPREFIX}bar${LIBSUFFIX}', libfoo[1]) diff --git a/test/Libs/bug2903/lib.c b/test/Libs/bug2903/lib.c index 048f715b..65f4cd29 100644 --- a/test/Libs/bug2903/lib.c +++ b/test/Libs/bug2903/lib.c @@ -1 +1,4 @@ +#ifdef _WIN32 +__declspec(dllexport) +#endif int i; diff --git a/test/Libs/bug2903/main.c b/test/Libs/bug2903/main.c index 3fe7d491..a4b1ecc1 100644 --- a/test/Libs/bug2903/main.c +++ b/test/Libs/bug2903/main.c @@ -1,3 +1,6 @@ +#ifdef _WIN32 +__declspec(dllexport) +#endif void func() { } |