From 09bd92c5c00d72e595bbcbd42b6adb8ee34f67ec Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 5 Nov 2010 16:38:44 +0000 Subject: [PATCH] * Source text_setup with explicitly given current directory path component. Apparently the source semantics has changed, as the that wasn't necessary in older OpenSuse versions. * Replaced gcc invocations in the test scripts with with compile_{lib,program}[_dl]() shell functions defined in test_setup. * Build libraries with -fPIC, so we don't get complaints for x86_64. Apparently the runtime loader semantics has changed in OpenSuse 11.2 compared to older versions. Some tests don't pass any longer (respectively even crash). Would be interesting to know what happens on a current FreeBSD. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39308 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../test_suite/dlopen_lookup_next1 | 12 +++++------ .../test_suite/dlopen_lookup_order1 | 10 +++++----- .../test_suite/dlopen_lookup_order2 | 10 +++++----- .../test_suite/dlopen_lookup_order3 | 12 +++++------ .../test_suite/dlopen_lookup_order4 | 10 +++++----- .../test_suite/dlopen_resolve_basic1 | 6 +++--- .../test_suite/dlopen_resolve_basic2 | 8 ++++---- .../test_suite/dlopen_resolve_basic3 | 10 +++++----- .../test_suite/dlopen_resolve_order1 | 8 ++++---- .../test_suite/dlopen_resolve_order2 | 12 +++++------ .../test_suite/dlopen_resolve_order3 | 12 +++++------ .../test_suite/dlopen_resolve_order4 | 12 +++++------ .../test_suite/dlopen_resolve_order5 | 14 ++++++------- .../test_suite/dlopen_resolve_order6 | 15 +++++++------- .../test_suite/dlopen_resolve_order7 | 10 +++++----- .../test_suite/load_lookup_next1 | 11 +++++----- .../test_suite/load_resolve_basic1 | 6 +++--- .../test_suite/load_resolve_order1 | 10 +++++----- .../test_suite/load_resolve_order2 | 10 +++++----- .../test_suite/load_resolve_order3 | 10 +++++----- .../test_suite/load_resolve_order4 | 8 ++++---- .../runtime_loader/test_suite/test_setup | 20 +++++++++++++++++++ 22 files changed, 127 insertions(+), 109 deletions(-) diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_next1 b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_next1 index 66f24cf042..7317873c3a 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_next1 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_next1 @@ -12,7 +12,7 @@ # libd.so -. test_setup +. ./test_setup # create libd.so @@ -21,7 +21,7 @@ int a() { return 1; } EOI # build -gcc -shared -o libd.so libd.c +compile_lib -o libd.so libd.c # create libb.so @@ -38,7 +38,7 @@ a() EOI # build -gcc -shared -o libb.so libb.c -D_GNU_SOURCE ./libd.so $libdl +compile_lib_dl -o libb.so libb.c ./libd.so # create liba.so @@ -54,7 +54,7 @@ a() EOI # build -gcc -shared -o liba.so liba.c -D_GNU_SOURCE ./libb.so $libdl +compile_lib_dl -o liba.so liba.c ./libb.so # create libe.so @@ -70,7 +70,7 @@ a() EOI # build -gcc -shared -o libe.so libe.c -D_GNU_SOURCE $libdl +compile_lib_dl -o libe.so libe.c # create program @@ -111,7 +111,7 @@ main() EOI # build -gcc -o program program.c -D_GNU_SOURCE $libdl -Wl,-rpath,.,--export-dynamic +compile_program_dl -o program program.c # run test_run_ok ./program 31 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order1 b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order1 index 19bf29e71a..a74b5e0bde 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order1 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order1 @@ -11,7 +11,7 @@ # libb_dependency.so. -. test_setup +. ./test_setup # create liba.so @@ -20,7 +20,7 @@ int a() { return 1; } EOI # build -gcc -shared -o liba.so liba.c +compile_lib -o liba.so liba.c # create libb_dependency.so @@ -29,7 +29,7 @@ int a() { return 2; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -38,7 +38,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create program @@ -83,7 +83,7 @@ main() EOI # build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic +compile_program_dl -o program program.c # run test_run_ok ./program 1 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order2 b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order2 index 2ef82c66c3..b029813ea3 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order2 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order2 @@ -11,7 +11,7 @@ # liba.so. -. test_setup +. ./test_setup # create liba.so @@ -20,7 +20,7 @@ int a() { return 1; } EOI # build -gcc -shared -o liba.so liba.c +compile_lib -o liba.so liba.c # create libb_dependency.so @@ -29,7 +29,7 @@ int a() { return 2; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -38,7 +38,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create program @@ -83,7 +83,7 @@ main() EOI # build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic +compile_program_dl -o program program.c # run test_run_ok ./program 2 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order3 b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order3 index 1d10720157..e5a1245cc8 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order3 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order3 @@ -12,7 +12,7 @@ # libb_dependency.so. -. test_setup +. ./test_setup # create libb_dependency.so @@ -21,7 +21,7 @@ int a() { return 1; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -30,7 +30,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create liba.so @@ -39,7 +39,7 @@ int a() { return 2; } EOI # build -gcc -shared -o libd.so libd.c +compile_lib -o libd.so libd.c # create liba.so @@ -48,7 +48,7 @@ int c() { return 1; } EOI # build -gcc -shared -o liba.so liba.c ./libb.so ./libd.so +compile_lib -o liba.so liba.c ./libb.so ./libd.so # create program @@ -79,7 +79,7 @@ main() EOI # build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic +compile_program_dl -o program program.c # run test_run_ok ./program 2 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order4 b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order4 index e23e370cdc..b5e3873e4e 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order4 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_lookup_order4 @@ -11,7 +11,7 @@ # symbol in liba.so, since libb.so is loaded RTLD_LOCAL. -. test_setup +. ./test_setup # create liba.so @@ -20,7 +20,7 @@ int a() { return 1; } EOI # build -gcc -shared -o liba.so liba.c +compile_lib -o liba.so liba.c # create libb_dependency.so @@ -29,7 +29,7 @@ int a() { return 2; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -38,7 +38,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create program @@ -83,7 +83,7 @@ main() EOI # build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic +compile_program_dl -o program program.c # run test_run_ok ./program 1 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic1 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic1 index a903684a3a..ace9b8774e 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic1 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic1 @@ -8,7 +8,7 @@ # Expected: Undefined symbol in liba.so resolve to symbol in program. -. test_setup +. ./test_setup # create liba.so @@ -18,7 +18,7 @@ int a() { return b(); } EOI # build -gcc -shared -o liba.so liba.c +compile_lib -o liba.so liba.c # create program @@ -53,7 +53,7 @@ main() EOI # build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic +compile_program_dl -o program program.c # run test_run_ok ./program 1 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic2 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic2 index 95ec6ff1ae..9324b09e8a 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic2 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic2 @@ -9,7 +9,7 @@ # Expected: Undefined symbol in liba.so resolves to symbol in libb.so. -. test_setup +. ./test_setup # create liba.so @@ -19,7 +19,7 @@ int a() { return b(); } EOI # build -gcc -shared -o liba.so liba.c +compile_lib -o liba.so liba.c # create libb.so @@ -28,7 +28,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c +compile_lib -o libb.so libb.c # create program @@ -60,7 +60,7 @@ main() EOI # build -gcc -o program program.c ./libb.so $libdl -Wl,-rpath,.,--export-dynamic +compile_program_dl -o program program.c ./libb.so # run test_run_ok ./program 1 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic3 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic3 index 9e3c738c56..4a7ee44131 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic3 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_basic3 @@ -11,7 +11,7 @@ # libb_dependency.so. -. test_setup +. ./test_setup # create libb_dependency.so @@ -20,7 +20,7 @@ int c() { return 1; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -29,7 +29,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create liba.so @@ -39,7 +39,7 @@ int a() { return c(); } EOI # build -gcc -shared -o liba.so liba.c ./libb.so +compile_lib -o liba.so liba.c ./libb.so # create program @@ -70,7 +70,7 @@ main() EOI # build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic +compile_program_dl -o program program.c # run test_run_ok ./program 1 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order1 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order1 index 99f908f376..f57f51fee8 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order1 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order1 @@ -10,7 +10,7 @@ # to symbol in libb.so. -. test_setup +. ./test_setup # create liba.so @@ -20,7 +20,7 @@ int a() { return b(); } EOI # build -gcc -shared -o liba.so liba.c +compile_lib -o liba.so liba.c # create libb.so @@ -29,7 +29,7 @@ int b() { return 2; } EOI # build -gcc -shared -o libb.so libb.c +compile_lib -o libb.so libb.c # create program @@ -70,7 +70,7 @@ main() EOI # build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic +compile_lib_dl -o program program.c # run test_run_ok ./program 1 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order2 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order2 index 16b10e9f8e..b82b5a1f86 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order2 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order2 @@ -12,7 +12,7 @@ # libd.so, not to symbol in libb_dependency.so. -. test_setup +. ./test_setup # create libb_dependency.so @@ -21,7 +21,7 @@ int c() { return 1; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -30,7 +30,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create libd.so @@ -39,7 +39,7 @@ int c() { return 2; } EOI # build -gcc -shared -o libd.so libd.c +compile_lib -o libd.so libd.c # create liba.so @@ -49,7 +49,7 @@ int a() { return c(); } EOI # build -gcc -shared -o liba.so liba.c ./libb.so ./libd.so +compile_lib -o liba.so liba.c ./libb.so ./libd.so # create program @@ -80,7 +80,7 @@ main() EOI # build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic +compile_lib_dl -o program program.c # run test_run_ok ./program 2 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order3 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order3 index fc6c118d7a..9c489716dc 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order3 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order3 @@ -11,7 +11,7 @@ # not to symbol in libb.so. -. test_setup +. ./test_setup # create libb.so @@ -20,7 +20,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c +compile_lib -o libb.so libb.c # create liba.so @@ -30,7 +30,7 @@ int a() { return b(); } EOI # build -gcc -shared -o liba.so liba.c ./libb.so +compile_lib -o liba.so liba.c ./libb.so # create libd.so @@ -39,7 +39,7 @@ int b() { return 2; } EOI # build -gcc -shared -o libd.so libd.c +compile_lib -o libd.so libd.c # create program @@ -76,8 +76,8 @@ main() } EOI -# build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic + #build +compile_program_dl -o program program.c # run test_run_ok ./program 2 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order4 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order4 index 8e3af54fe7..862c830592 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order4 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order4 @@ -12,7 +12,7 @@ # not to symbol in libb_dependency.so. -. test_setup +. ./test_setup # create libb_dependency.so @@ -21,7 +21,7 @@ int c() { return 1; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -30,7 +30,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create liba.so @@ -40,7 +40,7 @@ int a() { return c(); } EOI # build -gcc -shared -o liba.so liba.c ./libb.so +compile_lib -o liba.so liba.c ./libb.so # create libd.so @@ -49,7 +49,7 @@ int c() { return 2; } EOI # build -gcc -shared -o libd.so libd.c +compile_lib -o libd.so libd.c # create program @@ -87,7 +87,7 @@ main() EOI # build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic +compile_lib_dl -o program program.c # run test_run_ok ./program 2 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order5 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order5 index 52367c2c71..acb358d26a 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order5 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order5 @@ -13,7 +13,7 @@ # libd.so, not to symbol in libb_dependency.so. -. test_setup +. ./test_setup # create libb_dependency.so @@ -22,7 +22,7 @@ int c() { return 1; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -31,7 +31,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create libd.so @@ -40,7 +40,7 @@ int c() { return 2; } EOI # build -gcc -shared -o libd.so libd.c +compile_lib -o libd.so libd.c # create liba.so @@ -49,7 +49,7 @@ int e() { return 0; } EOI # build -gcc -shared -o liba.so liba.c ./libb.so ./libd.so +compile_lib -o liba.so liba.c ./libb.so ./libd.so # create libe.so @@ -59,7 +59,7 @@ int a() { return c(); } EOI # build -gcc -shared -o libe.so libe.c +compile_lib -o libe.so libe.c # create program @@ -97,7 +97,7 @@ main() EOI # build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic +compile_program_dl -o program program.c # run test_run_ok ./program 2 diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order6 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order6 index afbb9eb030..3ec50aa3e3 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order6 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order6 @@ -13,7 +13,7 @@ # libb_dependency.so, not to symbol in libd.so. -. test_setup +. ./test_setup # create libb_dependency.so @@ -22,7 +22,7 @@ int c() { return 1; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -31,7 +31,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create libd.so @@ -40,7 +40,7 @@ int c() { return 2; } EOI # build -gcc -shared -o libd.so libd.c +compile_lib -o libd.so libd.c # create liba.so @@ -50,7 +50,7 @@ int e() { return 0; } EOI # build -gcc -shared -o liba.so liba.c ./libb.so +compile_lib -o liba.so liba.c ./libb.so # create libe.so @@ -60,7 +60,7 @@ int a() { return c(); } EOI # build -gcc -shared -o libe.so libe.c +compile_lib -o libe.so libe.c # create program @@ -105,8 +105,7 @@ main() EOI # build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic +compile_program_dl -o program program.c # run test_run_ok ./program 1 - diff --git a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order7 b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order7 index 72a6d39ba3..a12d6d9a83 100755 --- a/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order7 +++ b/src/tests/system/runtime_loader/test_suite/dlopen_resolve_order7 @@ -11,7 +11,7 @@ # not to symbol in libd.so, since it's loaded RTLD_LOCAL. -. test_setup +. ./test_setup # create libb.so @@ -20,7 +20,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c +compile_lib -o libb.so libb.c # create liba.so @@ -30,7 +30,7 @@ int a() { return b(); } EOI # build -gcc -shared -o liba.so liba.c ./libb.so +compile_lib -o liba.so liba.c ./libb.so # create libd.so @@ -39,7 +39,7 @@ int b() { return 2; } EOI # build -gcc -shared -o libd.so libd.c +compile_lib -o libd.so libd.c # create program @@ -77,7 +77,7 @@ main() EOI # build -gcc -o program program.c $libdl -Wl,-rpath,.,--export-dynamic +compile_program_dl -o program program.c # run test_run_ok ./program 1 diff --git a/src/tests/system/runtime_loader/test_suite/load_lookup_next1 b/src/tests/system/runtime_loader/test_suite/load_lookup_next1 index 1a053f434e..f76374c414 100755 --- a/src/tests/system/runtime_loader/test_suite/load_lookup_next1 +++ b/src/tests/system/runtime_loader/test_suite/load_lookup_next1 @@ -8,7 +8,7 @@ # Expected: dlsym(RTLD_NEXT) finds symbol in order liba.so, libb.so, libd.so -. test_setup +. ./test_setup # create libd.so @@ -17,7 +17,7 @@ int a() { return 1; } EOI # build -gcc -shared -o libd.so libd.c +compile_lib -o libd.so libd.c # create libb.so @@ -34,7 +34,7 @@ a() EOI # build -gcc -shared -o libb.so libb.c -D_GNU_SOURCE ./libd.so $libdl +compile_lib_dl -o libb.so libb.c ./libd.so # create liba.so @@ -50,7 +50,7 @@ a() EOI # build -gcc -shared -o liba.so liba.c -D_GNU_SOURCE ./libb.so $libdl +compile_lib_dl -o liba.so liba.c ./libb.so # create program @@ -73,8 +73,7 @@ main() EOI # build -gcc -o program program.c -D_GNU_SOURCE ./liba.so $libdl \ - -Wl,-rpath,.,--export-dynamic +compile_program_dl -o program program.c ./liba.so # run test_run_ok ./program 15 diff --git a/src/tests/system/runtime_loader/test_suite/load_resolve_basic1 b/src/tests/system/runtime_loader/test_suite/load_resolve_basic1 index 2644e26f9b..506ae29c5b 100755 --- a/src/tests/system/runtime_loader/test_suite/load_resolve_basic1 +++ b/src/tests/system/runtime_loader/test_suite/load_resolve_basic1 @@ -6,7 +6,7 @@ # Expected: Undefined symbol in liba.so resolves to symbol in program. -. test_setup +. ./test_setup # create liba.so @@ -16,7 +16,7 @@ int a() { return b(); } EOI # build -gcc -shared -o liba.so liba.c +compile_lib -o liba.so liba.c # create program @@ -37,7 +37,7 @@ main() EOI # build -gcc -o program program.c ./liba.so -Wl,-rpath,.,--export-dynamic +compile_program -o program program.c ./liba.so # run test_run_ok ./program 1 diff --git a/src/tests/system/runtime_loader/test_suite/load_resolve_order1 b/src/tests/system/runtime_loader/test_suite/load_resolve_order1 index f739e8916a..9869610cb7 100755 --- a/src/tests/system/runtime_loader/test_suite/load_resolve_order1 +++ b/src/tests/system/runtime_loader/test_suite/load_resolve_order1 @@ -9,7 +9,7 @@ # not to symbol in libb_dependency.so. -. test_setup +. ./test_setup # create liba.so @@ -18,7 +18,7 @@ int a() { return 1; } EOI # build -gcc -shared -o liba.so liba.c +compile_lib -o liba.so liba.c # create libb_dependency.so @@ -27,7 +27,7 @@ int a() { return 2; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -36,7 +36,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create program @@ -50,7 +50,7 @@ main() EOI # build -gcc -o program program.c ./liba.so ./libb.so -Wl,-rpath,.,--export-dynamic +compile_program -o program program.c ./liba.so ./libb.so # run test_run_ok ./program 1 diff --git a/src/tests/system/runtime_loader/test_suite/load_resolve_order2 b/src/tests/system/runtime_loader/test_suite/load_resolve_order2 index e0f9409156..792b62530c 100755 --- a/src/tests/system/runtime_loader/test_suite/load_resolve_order2 +++ b/src/tests/system/runtime_loader/test_suite/load_resolve_order2 @@ -9,7 +9,7 @@ # not to symbol in libb_dependency.so. -. test_setup +. ./test_setup # create liba.so @@ -18,7 +18,7 @@ int a() { return 1; } EOI # build -gcc -shared -o liba.so liba.c +compile_lib -o liba.so liba.c # create libb_dependency.so @@ -27,7 +27,7 @@ int a() { return 2; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -36,7 +36,7 @@ int b() { return 1; } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create program @@ -50,7 +50,7 @@ main() EOI # build -gcc -o program program.c ./libb.so ./liba.so -Wl,-rpath,.,--export-dynamic +compile_program -o program program.c ./libb.so ./liba.so # run test_run_ok ./program 1 diff --git a/src/tests/system/runtime_loader/test_suite/load_resolve_order3 b/src/tests/system/runtime_loader/test_suite/load_resolve_order3 index cb38223a1d..554387b698 100755 --- a/src/tests/system/runtime_loader/test_suite/load_resolve_order3 +++ b/src/tests/system/runtime_loader/test_suite/load_resolve_order3 @@ -9,7 +9,7 @@ # not to symbol in libb_dependency.so. -. test_setup +. ./test_setup # create liba.so @@ -18,7 +18,7 @@ int a() { return 1; } EOI # build -gcc -shared -o liba.so liba.c +compile_lib -o liba.so liba.c # create libb_dependency.so @@ -27,7 +27,7 @@ int a() { return 2; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -37,7 +37,7 @@ int b() { return a(); } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create program @@ -51,7 +51,7 @@ main() EOI # build -gcc -o program program.c ./liba.so ./libb.so -Wl,-rpath,.,--export-dynamic +compile_program -o program program.c ./liba.so ./libb.so # run test_run_ok ./program 1 diff --git a/src/tests/system/runtime_loader/test_suite/load_resolve_order4 b/src/tests/system/runtime_loader/test_suite/load_resolve_order4 index 5cfddf9bb0..05cf64e921 100755 --- a/src/tests/system/runtime_loader/test_suite/load_resolve_order4 +++ b/src/tests/system/runtime_loader/test_suite/load_resolve_order4 @@ -8,7 +8,7 @@ # not to symbol in libb_dependency.so. -. test_setup +. ./test_setup # create libb_dependency.so @@ -17,7 +17,7 @@ int a() { return 2; } EOI # build -gcc -shared -o libb_dependency.so libb_dependency.c +compile_lib -o libb_dependency.so libb_dependency.c # create libb.so @@ -27,7 +27,7 @@ int b() { return a(); } EOI # build -gcc -shared -o libb.so libb.c ./libb_dependency.so +compile_lib -o libb.so libb.c ./libb_dependency.so # create program @@ -45,7 +45,7 @@ main() EOI # build -gcc -o program program.c ./libb.so -Wl,-rpath,.,--export-dynamic +compile_program -o program program.c ./libb.so # run test_run_ok ./program 1 diff --git a/src/tests/system/runtime_loader/test_suite/test_setup b/src/tests/system/runtime_loader/test_suite/test_setup index ad1597589b..d8e0d70f94 100644 --- a/src/tests/system/runtime_loader/test_suite/test_setup +++ b/src/tests/system/runtime_loader/test_suite/test_setup @@ -30,3 +30,23 @@ test_run_ok() exit 1 fi } + +compile_lib() +{ + gcc -shared $@ -D_GNU_SOURCE -fPIC +} + +compile_lib_dl() +{ + compile_lib $@ $libdl +} + +compile_program() +{ + gcc $@ -D_GNU_SOURCE -Wl,-rpath,.,--export-dynamic +} + +compile_program_dl() +{ + compile_program $@ $libdl +}