diff options
-rw-r--r-- | test/configure.ac | 20 | ||||
-rw-r--r-- | test/runtests.sh | 8 |
2 files changed, 21 insertions, 7 deletions
diff --git a/test/configure.ac b/test/configure.ac index d3230887..cacb7e56 100644 --- a/test/configure.ac +++ b/test/configure.ac @@ -13,14 +13,26 @@ dnl Which colm are we testing. Default is the one in parent's source dir. dnl AC_ARG_WITH(subject, [AC_HELP_STRING([--with-subject], [location of colm to test])], - [SUBJECT="$withval/bin/colm"], - [SUBJECT="../src/colm"] + [ + SUBJECT_BIN="$withval/bin/colm" + SUBJECT_CPPFLAGS="-I$withval/include" + SUBJECT_LDFLAGS="-L$withval/lib" + ], + [ + SUBJECT_BIN="../src/colm" + SUBJECT_CPPFLAGS="-I../src/include" + SUBJECT_LDFLAGS="-L../src" + ] ) -AC_SUBST(SUBJECT) +AC_SUBST(SUBJECT_BIN) +AC_SUBST(SUBJECT_CPPFLAGS) +AC_SUBST(SUBJECT_LDFLAGS) SED_SUBST=["\ - -e 's|@SUBJECT@|${SUBJECT}|g' \ + -e 's|@SUBJECT_BIN@|${SUBJECT_BIN}|g' \ + -e 's|@SUBJECT_CPPFLAGS@|${SUBJECT_CPPFLAGS}|g' \ + -e 's|@SUBJECT_LDFLAGS@|${SUBJECT_LDFLAGS}|g' \ "] AC_SUBST(SED_SUBST) diff --git a/test/runtests.sh b/test/runtests.sh index 8223890d..7eeebba0 100644 --- a/test/runtests.sh +++ b/test/runtests.sh @@ -38,7 +38,9 @@ WORKING=working ERRORS=0 -COLM=@SUBJECT@ +COLM="@SUBJECT_BIN@" +CPPFLAGS="@SUBJECT_CPPFLAGS@" +LDFLAGS="@SUBJECT_LDFLAGS@" cd `dirname $0` test -d $WORKING || mkdir $WORKING @@ -200,8 +202,8 @@ function runtests() continue fi - echo_cmd gcc -c -I../src/include -L../src -o $PARSE.o $PARSE.c - echo_cmd g++ -I. -I../src/include -L../src -o $WORKING/$ROOT \ + echo_cmd gcc -c $CPPFLAGS $LDFLAGS -o $PARSE.o $PARSE.c + echo_cmd g++ -I. $CPPFLAGS $LDFLAGS -o $WORKING/$ROOT \ $IF.cc $HOST $PARSE.o -lcolmd if ! check_compilation $?; then |