diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-09-06 07:38:10 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-09-06 07:38:16 +0200 |
| commit | 183d99737298bb3200f0610fdcd1c7549c8ed560 (patch) | |
| tree | b9b6f28ffeb65e57ccd93fece4188a66daaac716 /scripts/dso-ordering-test.py | |
| parent | 2fc7320668ee843f9d1e5a2ec6c6fdbf00c735a3 (diff) | |
| download | glibc-183d99737298bb3200f0610fdcd1c7549c8ed560.zip glibc-183d99737298bb3200f0610fdcd1c7549c8ed560.tar.gz glibc-183d99737298bb3200f0610fdcd1c7549c8ed560.tar.bz2 | |
scripts/dso-ordering-test.py: Generate program run-time dependencies
The main program needs to depend on all shared objects, even objects
that have link-time dependencies among shared objects. Filtering
out shared objects that already have an link-time dependencies is not
necessary here; make will do this automatically.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'scripts/dso-ordering-test.py')
| -rw-r--r-- | scripts/dso-ordering-test.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/dso-ordering-test.py b/scripts/dso-ordering-test.py index 2dd6bfd..b87cf2f 100644 --- a/scripts/dso-ordering-test.py +++ b/scripts/dso-ordering-test.py @@ -707,13 +707,12 @@ def process_testcase(t): "\t$(compile.c) $(OUTPUT_OPTION)\n") makefile.write (rule) - not_depended_objs = find_objs_not_depended_on(test_descr) - if not_depended_objs: - depstr = "" - for dep in not_depended_objs: - depstr += (" $(objpfx)" + test_subdir + "/" - + test_name + "-" + dep + ".so") - makefile.write("$(objpfx)%s.out:%s\n" % (base_test_name, depstr)) + # Ensure that all shared objects are built before running the + # test, whether there link-time dependencies or not. + depobjs = ["$(objpfx){}/{}-{}.so".format(test_subdir, test_name, dep) + for dep in test_descr.objs] + makefile.write("$(objpfx){}.out: {}\n".format( + base_test_name, " ".join(depobjs))) # Add main executable to test-srcs makefile.write("test-srcs += %s/%s\n" % (test_subdir, test_name)) |