check test tests: runtests
@for A in $(SUBDIRS); do cd $$A && $(MAKE) $@ && cd .. || exit 1; done
- MAKECHECK=1 ./libwrap @TOP_OBJDIR@/lib \
+ MAKECHECK=1 $(abs_top_srcdir)/tests/libwrap @TOP_OBJDIR@/lib \
./runtests $(abs_top_srcdir)/tests/TESTS
install:
TESTS = authcon-t superuser-t keys-t realms-t
-MODULE_CFLAGS=-I$(srcdir)/../.. -I$(srcdir)/../common/
+MODULE_CFLAGS=-I$(TOP_OBJDIR) -I$(srcdir)/../common/
all check test tests: $(TESTS)
include @TOP_OBJDIR@/src/config/Makefile.config
include @TOP_OBJDIR@/src/config/Makefile.pthread
-MODULE_CFLAGS = -I$(srcdir)/../..
+MODULE_CFLAGS = -I$(TOP_OBJDIR)
LIBS = ../tap/libtap.a \
$(abs_top_builddir)/src/cmd/liboafs_cmd.la \
include @TOP_OBJDIR@/src/config/Makefile.config
include @TOP_OBJDIR@/src/config/Makefile.pthread
-MODULE_CFLAGS=-I$(srcdir)/.. -I$(srcdir)/../..
+MODULE_CFLAGS=-I$(TOP_OBJDIR)
all check test tests: config.o servers.o ubik.o rxkad.o network.o
include @TOP_OBJDIR@/src/config/Makefile.config
include @TOP_OBJDIR@/src/config/Makefile.pthread
-MODULE_CFLAGS = -I$(srcdir)/../..
+MODULE_CFLAGS = -I$(TOP_OBJDIR)
LIBS=../tap/libtap.a $(abs_top_builddir)/src/opr/liboafs_opr.la
# Start up our test process, and send it various signals. Check that these
# signals make it to it correctly, and are reported on the command line.
-my $softsig_helper = $Bin . "/softsig-helper";
+
+my $softsig_helper;
+
+# Our softsig helper should be in $TOP_OBJDIR/tests/opr. To calculate that
+# path, use the BUILD env var if the test harness has set it; otherwise, our
+# next best guess is that it's in the same dir as this script.
+if (defined($ENV{BUILD})) {
+ $softsig_helper = $ENV{BUILD} . "/opr/softsig-helper";
+} else {
+ $softsig_helper = $Bin . "/softsig-helper";
+}
# This -dummy argument prevents Perl from putting an intermediate sh
# -c between us and softsig-helper in the case where the build
include @TOP_OBJDIR@/src/config/Makefile.config
include @TOP_OBJDIR@/src/config/Makefile.pthread
-MODULE_CFLAGS = -I$(srcdir)/../..
+MODULE_CFLAGS = -I$(TOP_OBJDIR)
LIBS = ../tap/libtap.a \
$(abs_top_builddir)/src/rx/liboafs_rx.la
include @TOP_OBJDIR@/src/config/Makefile.config
include @TOP_OBJDIR@/src/config/Makefile.lwp
-MODULE_CFLAGS = -I$(srcdir)/../..
+MODULE_CFLAGS = -I$(TOP_OBJDIR)
LIBS = ../tap/libtap.a \
$(abs_top_builddir)/lib/util.a \
TESTS = vos-t
-MODULE_CFLAGS=-I$(srcdir)/../.. -I$(srcdir)/../common/
+MODULE_CFLAGS=-I$(TOP_OBJDIR) -I$(srcdir)/../common/
all check test tests: $(TESTS)