gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attempt fix for problem on non-flattened systems

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32427 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-03-01 12:39:09 +00:00
parent 5a1a177160
commit 6874bfda3a
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2011-01-29 Richard Frith-Macdonald <rfm@gnu.org>
* TestFramework/gnustep-tests.in:
* TestFramework/GNUmakefile.in:
* TestFramework/README:
Override GNUSTEP_OBJ_DIR so that executables are always stored in ./obj
even if we are building non-flattened. There's no point using a
non-flattened layout inside the test framework as we need to clean and
re-build for each test run anyway.
2011-01-29 Richard Frith-Macdonald <rfm@gnu.org>
* TestFramework/gnustep-tests.in:

2
TestFramework/GNUmakefile.in
View file

@ -4,6 +4,8 @@
include $(GNUSTEP_MAKEFILES)/common.make
-include ../GNUmakefile.super
@TESTOPTS@
TEST_TOOL_NAME = @TESTNAMES@
ADDITIONAL_OBJCFLAGS += @TESTFLAGS@ -Wall

6
TestFramework/README
View file

@ -245,8 +245,10 @@ create the GNUmakefile rather than using its own make file.
This template makefile may use @TESTNAMES@ where it wants a list of the
tests to be run, and @TESTRULES@ where it wants the rules to build the
tests to be included.
It should also use @GSTESTFLAGS@ where it wants additions flags to tell
the compiler about the test framework to be substituted.
It should also use @TESTFLAGS@ where it wants additions flags to tell
the compiler about the test framework to be substituted, and @TESTOPTS@
near the start of the file to permit necessary makefile control to say
where the executables should be stored.
The GNUmakefile.tests script should build each individual test when it is
invoked with that test name as a target, and it should also build all tests
if it is invoked without a target, and have a 'clean' target to clean up

5
TestFramework/gnustep-tests.in
View file

@ -127,6 +127,7 @@ then
GSTESTFLAGS="$GSTESTFLAGS -DFAILFAST=1"
fi
GSTESTLIBS=`gnustep-config --gui-libs`
GSTESTOPTS="GNUSTEP_OBJ_DIR=./obj"
if test x"$BASH_VERSION" = x
then
@ -478,9 +479,9 @@ ${tmp}_OBJC_FILES=$TESTFILE"
done
if test "$GSTESTMODE" = "failfast"
then
sed -e "s/@TESTNAMES@/$TESTNAMES/;s/@TESTRULES@/$TESTRULES/;s^@TESTFLAGS@^-I$GSTESTTOP -DFAILFAST=1^" < "$TEMPLATE" > GNUmakefile
sed -e "s/@TESTNAMES@/$TESTNAMES/;s^@TESTOPTS@^$GSTESTOPTS^;s/@TESTRULES@/$TESTRULES/;s^@TESTFLAGS@^-I$GSTESTTOP -DFAILFAST=1^" < "$TEMPLATE" > GNUmakefile
else
sed -e "s/@TESTNAMES@/$TESTNAMES/;s/@TESTRULES@/$TESTRULES/;s^@TESTFLAGS@^-I$GSTESTTOP^" < "$TEMPLATE" > GNUmakefile
sed -e "s/@TESTNAMES@/$TESTNAMES/;s^@TESTOPTS@^$GSTESTOPTS^;s/@TESTRULES@/$TESTRULES/;s^@TESTFLAGS@^-I$GSTESTTOP^" < "$TEMPLATE" > GNUmakefile
fi
$MAKE_CMD clean >/dev/null 2>&1