summaryrefslogtreecommitdiff
path: root/test/unistd/Makefile.in
diff options
context:
space:
mode:
authorAustin Foxley <austinf@cetoncorp.com>2010-04-06 08:58:29 -0700
committerAustin Foxley <austinf@cetoncorp.com>2010-04-06 08:58:33 -0700
commitf10d127d36ada5b202cdea521e61b05522beb192 (patch)
tree44ae75bf0745de49fb46616afd4cf577cf7a258a /test/unistd/Makefile.in
parentc3af26045aa44286482fbfe93097f24b48cfb6a3 (diff)
parent384a55ef9f3387ed33eadab3eefe5057b4daeadb (diff)
Merge commit 'origin/master' into nptl
Conflicts: libc/misc/utmp/utent.c libc/sysdeps/linux/i386/bits/syscalls.h Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'test/unistd/Makefile.in')
-rw-r--r--test/unistd/Makefile.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/unistd/Makefile.in b/test/unistd/Makefile.in
index ae0eeb499..8ddfc52da 100644
--- a/test/unistd/Makefile.in
+++ b/test/unistd/Makefile.in
@@ -10,6 +10,11 @@ else
OPTS_tstgetopt := -a -b -cfoobar --required foobar --optional=bazbug --none --colou --color --colour random
endif
-TESTS_DISABLED+=getconf
+# getconf.c lives in utils/
+# Testsuite cannot currently be built with O= anyway, so hardcode path here
+getconf.c:
+ $(LN_S) ../../utils/$(@F) .
+EXTRA_CLEAN += getconf.c
+TESTS_DISABLED += getconf
CFLAGS_getconf = -DGETCONF_DIR='"$(CURDIR)"'
shell_tst-getconf: getconf getconf_glibc