From 3b087fcb2b287c6fd787fc226ebe9dc0026b01a4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 13 Apr 2016 17:01:11 +0200 Subject: [PATCH] Fix running C test suite when using a separate build directory Correct top_srcdir path and use ../$(srcdir) instead of just "../" which may not be the same when building in another directory. --- Examples/test-suite/c/Makefile.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in index 0c24247a9..f8676b5a0 100644 --- a/Examples/test-suite/c/Makefile.in +++ b/Examples/test-suite/c/Makefile.in @@ -7,11 +7,13 @@ C = gcc CXX = g++ SCRIPTSUFFIX = _runme.c srcdir = @srcdir@ -top_srcdir = @top_srcdir@/.. -top_builddir = @top_builddir@/.. +top_srcdir = ../@top_srcdir@ +top_builddir = ../@top_builddir@ include $(srcdir)/../common.mk +SRCDIR = ../$(srcdir)/ + CPP_TEST_CASES += \ cpp_basic_class \ cpp_basic_class_enum \ @@ -81,7 +83,7 @@ setup = \ # a file is found which has _runme.c appended after the testcase name. run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (\ - cd $* && $(COMPILETOOL) $(CC) ../$*_runme.c -L. -l$* -o $*_runme && \ + cd $* && $(COMPILETOOL) $(CC) ../$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) -I.. -L. -l$* -o $*_runme && \ env LD_LIBRARY_PATH=".:$$LD_LIBRARY_PATH" PATH=".:$$PATH" SHLIB_PATH=".:$$SHLIB_PATH" DYLD_LIBRARY_PATH=".:$$DYLD_LIBRARY_PATH" $(RUNTOOL) ./$*_runme;) \ fi;