|
 |
920d6f |
diff -rup a/testsuite/Makefile.am b/testsuite/Makefile.am
|
|
|
920d6f |
--- a/testsuite/Makefile.am 2012-12-16 20:53:45.000000000 -0500
|
|
|
920d6f |
+++ b/testsuite/Makefile.am 2019-06-28 16:59:19.935602953 -0400
|
|
|
920d6f |
@@ -39,6 +39,7 @@ env.exp: Makefile
|
|
|
920d6f |
rm -f env.exp
|
|
|
920d6f |
echo set libelf_LD_LIBRARY_PATH '"$(libelf_LD_LIBRARY_PATH)"' >> $@
|
|
|
920d6f |
echo set libunwind_LD_LIBRARY_PATH '"$(libunwind_LD_LIBRARY_PATH)"' >> $@
|
|
|
920d6f |
+ echo set PREFIX '"$(prefix)"' >> $@
|
|
|
920d6f |
|
|
|
920d6f |
CLEANFILES = *.o *.so *.log *.sum *.ltrace site.bak setval.tmp site.exp env.exp
|
|
|
920d6f |
|
|
|
920d6f |
diff -rup a/testsuite/Makefile.in b/testsuite/Makefile.in
|
|
|
920d6f |
--- a/testsuite/Makefile.in 2013-11-04 20:22:47.000000000 -0500
|
|
|
920d6f |
+++ b/testsuite/Makefile.in 2019-06-28 16:59:12.075602806 -0400
|
|
|
920d6f |
@@ -648,6 +648,7 @@ env.exp: Makefile
|
|
|
920d6f |
rm -f env.exp
|
|
|
920d6f |
echo set libelf_LD_LIBRARY_PATH '"$(libelf_LD_LIBRARY_PATH)"' >> $@
|
|
|
920d6f |
echo set libunwind_LD_LIBRARY_PATH '"$(libunwind_LD_LIBRARY_PATH)"' >> $@
|
|
|
920d6f |
+ echo set PREFIX '"$(prefix)"' >> $@
|
|
|
920d6f |
|
|
|
920d6f |
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
|
920d6f |
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
|
920d6f |
diff -rup a/testsuite/ltrace.main/system_call_params.exp b/testsuite/ltrace.main/system_call_params.exp
|
|
|
920d6f |
--- a/testsuite/ltrace.main/system_call_params.exp 2019-06-28 16:44:07.542584754 -0400
|
|
|
920d6f |
+++ b/testsuite/ltrace.main/system_call_params.exp 2019-06-28 17:00:35.811604355 -0400
|
|
|
920d6f |
@@ -1,5 +1,5 @@
|
|
|
920d6f |
# This file is part of ltrace.
|
|
|
920d6f |
-# Copyright (C) 2013, 2014 Petr Machata, Red Hat Inc.
|
|
|
920d6f |
+# Copyright (C) 2013, 2014, 2015 Petr Machata, Red Hat Inc.
|
|
|
920d6f |
#
|
|
|
920d6f |
# This program is free software; you can redistribute it and/or
|
|
|
920d6f |
# modify it under the terms of the GNU General Public License as
|
|
|
920d6f |
@@ -60,8 +60,35 @@ set conf [ltraceNamedSource "$dir/syscal
|
|
|
920d6f |
# somelib.conf is passed, and syscalls.conf is not available, or
|
|
|
920d6f |
# doesn't list readdir, that would be taken from somelib.conf with a
|
|
|
920d6f |
# wrong prototype.
|
|
|
920d6f |
+#
|
|
|
920d6f |
+# This test relies on the fact that there is no global config file
|
|
|
920d6f |
+# that would provide legitimate system call prototypes. But that
|
|
|
920d6f |
+# doesn't have to be true, maybe ltrace is already installed on the
|
|
|
920d6f |
+# system with the right prefix. So first compile a wrapper that we
|
|
|
920d6f |
+# use to redirect fopen calls.
|
|
|
920d6f |
+
|
|
|
920d6f |
+set libfopen_so [ltraceCompile libfopen.so -ldl \
|
|
|
920d6f |
+ [ltraceSource c [string map [list "@PREFIX@" "$PREFIX"] {
|
|
|
920d6f |
+ #define _GNU_SOURCE
|
|
|
920d6f |
+ #include <dlfcn.h>
|
|
|
920d6f |
+ #include <stdio.h>
|
|
|
920d6f |
+ #include <string.h>
|
|
|
920d6f |
+
|
|
|
920d6f |
+ FILE *
|
|
|
920d6f |
+ fopen(const char *path, const char *mode)
|
|
|
920d6f |
+ {
|
|
|
920d6f |
+ #define PATH "@PREFIX@/share"
|
|
|
920d6f |
+ if (strncmp(path, PATH, sizeof(PATH) - 1) == 0)
|
|
|
920d6f |
+ path = "/dev/null";
|
|
|
920d6f |
|
|
|
920d6f |
+ return ((FILE *(*)(const char *, const char *))
|
|
|
920d6f |
+ dlsym(RTLD_NEXT, "fopen")) (path, mode);
|
|
|
920d6f |
+ }
|
|
|
920d6f |
+}]]]
|
|
|
920d6f |
+
|
|
|
920d6f |
+setenv LD_PRELOAD $libfopen_so
|
|
|
920d6f |
ltraceMatch1 [ltraceRun -L -S -F $conf -- $bin] {^open@SYS\("/some/path", 0\)} == 0
|
|
|
920d6f |
+unsetenv LD_PRELOAD
|
|
|
920d6f |
|
|
|
920d6f |
# On the other hand, if -F somedir/ is given, we want to accept
|
|
|
920d6f |
# syscalls.conf found there.
|