summaryrefslogtreecommitdiffstats
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-24 14:58:45 (GMT)
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-24 14:58:45 (GMT)
commit1090b56a0a6f1549affa0db9e70037e3c0883d67 (patch)
tree7a45b73259659f34b61e9aef57308f9623924f12 /tests/Makefile.am
parenta269d13d6d090f247b0314c97fb0a0c81d0aee8f (diff)
parentc4220eaf0f552cfd68148ddefd6455ff2ce0e08c (diff)
downloadpatchelf-1090b56a0a6f1549affa0db9e70037e3c0883d67.zip
patchelf-1090b56a0a6f1549affa0db9e70037e3c0883d67.tar.gz
patchelf-1090b56a0a6f1549affa0db9e70037e3c0883d67.tar.bz2
Merge branch 'master' of github.com:vdanjean/patchelf
Conflicts: tests/Makefile.am
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am41
1 files changed, 37 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 708b17e..7922783 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,21 +1,50 @@
-check_PROGRAMS = simple main main-scoped big-dynstr
+check_PROGRAMS = simple main main-scoped big-dynstr no-rpath
-TESTS = plain-fail.sh plain-run.sh shrink-rpath.sh set-interpreter-short.sh \
+no_rpath_arch_TESTS = \
+ no-rpath-amd64.sh \
+ no-rpath-armel.sh \
+ no-rpath-armhf.sh \
+ no-rpath-hurd-i386.sh \
+ no-rpath-i386.sh \
+ no-rpath-ia64.sh \
+ no-rpath-kfreebsd-amd64.sh \
+ no-rpath-kfreebsd-i386.sh \
+ no-rpath-mips.sh \
+ no-rpath-mipsel.sh \
+ no-rpath-powerpc.sh \
+ no-rpath-s390.sh \
+ no-rpath-sh4.sh \
+ no-rpath-sparc.sh
+
+XFAIL_TESTS = no-rpath-ia64.sh
+
+src_TESTS = \
+ plain-fail.sh plain-run.sh shrink-rpath.sh set-interpreter-short.sh \
set-interpreter-long.sh set-rpath.sh no-rpath.sh big-dynstr.sh \
set-rpath-library.sh soname.sh
-EXTRA_DIST = no-rpath $(TESTS)
+
+build_TESTS = \
+ $(no_rpath_arch_TESTS)
+
+TESTS = $(src_TESTS) $(build_TESTS)
+
+EXTRA_DIST = no-rpath-prebuild $(src_TESTS) no-rpath-prebuild.sh
TESTS_ENVIRONMENT = PATCHELF_DEBUG=1
+$(no_rpath_arch_TESTS): no-rpath-prebuild.sh
+ @ln -s $< $@
+
CLEANFILES = big-dynstr.c
clean-local:
- $(RM) -r scratch
+ $(RM) -r scratch $(no_rpath_arch_TESTS)
# by default, use -fpic to compile
AM_CFLAGS = -fpic
LDFLAGS_local = -Wl,--disable-new-dtags -Wl,-rpath-link=. -L. $(AM_LDFLAGS)
LDFLAGS_sharedlib = -Wl,--disable-new-dtags -shared -L. $(AM_LDFLAGS)
export NIX_DONT_SET_RPATH=1
+export NIX_LDFLAGS=
simple_SOURCES = simple.c
# no -fpic for simple.o
@@ -64,3 +93,7 @@ libbar_scoped_so_LDFLAGS = $(LDFLAGS_sharedlib)
libsimple_so_SOURCES = simple.c
libsimple_so_LDFLAGS = $(LDFLAGS_sharedlib) -Wl,-soname,libsimple.so.1.0
+
+no_rpath_SOURCES = no-rpath.c
+# no -fpic for no-rpath.o
+no_rpath_CFLAGS =