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

Add Stefan's C/CC support patchj (plus adding rule to actually build).

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@36727 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2013-06-17 06:20:47 +00:00
parent 7326469c41
commit 076660864d
2 changed files with 45 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-06-17 Stefan Bidi <stefanbidi@gmail.com>
* TestFramework/gnustep-tests.in: add support for .c and .cc files
2012-04-08 Richard Frith-Macdonald <rfm@gnu.org>
* TestFramework/ObjectTesting.h: Fix error performing equality test

49
TestFramework/gnustep-tests.in
View file

@ -252,8 +252,16 @@ then
BARE=`basename $TESTS .mm`
if test x"$BARE" = x"$TESTS"
then
echo "The file '$1' does not end in .m or .mm ... cannot test."
exit 1
BARE=`basename $TESTS .c`
if test x"$BARE" = x"$TESTS"
then
BARE=`basename $TESTS .cc`
if test x"$BARE" = x"TESTS"
then
echo "The file '$1' does not end in .m, .mm, .c or .cc ... cannot test."
exit 1
fi
fi
fi
fi
else
@ -315,7 +323,19 @@ build_and_run ()
tmp=`basename $TESTFILE .m`
if test x"$tmp" = x"$TESTFILE"
then
BUILD_CMD="$OBJCXX -o ./obj/$TESTNAME $TESTFILE $GSTESTFLAGS $GSTESTLIBS"
tmp=`basename $TESTFILE .mm`
if test x"$tmp" = x"$TESTFILE"
then
tmp=`basename $TESTFILE .c`
if test x"$tmp" = x"$TESTFILE"
then
BUILD_CMD="$CXX -o ./obj/$TESTNAME $TESTFILE $ADDITIONAL_CXXFLAGS $ADDITIONAL_LDFLAGS"
else
BUILD_CMD="$CC -o ./obj/$TESTNAME $TESTFILE $ADDITIONAL_CFLAGS $ADDITIONAL_LDFLAGS"
fi
else
BUILD_CMD="$OBJCXX -o ./obj/$TESTNAME $TESTFILE $GSTESTFLAGS $GSTESTLIBS"
fi
else
BUILD_CMD="$CC -o ./obj/$TESTNAME $TESTFILE $GSTESTFLAGS $GSTESTLIBS"
fi
@ -454,10 +474,10 @@ do
if test x"$OBJCXX" = x
then
# Only Objective-C (and C)
SRCDIRS=`find $TESTDIR -name "*.m" | sed -e 's;/[^/]*$;;' | sort -u | sed -e 's/\(^\| \)X[^ ]*//g'`
SRCDIRS=`find $TESTDIR -name "*.m" -o -name "*.c" | sed -e 's;/[^/]*$;;' | sort -u | sed -e 's/\(^\| \)X[^ ]*//g'`
else
# Objective-C and Objective-C++ (implicitly C and C++ too)
SRCDIRS=`find $TESTDIR \( -name "*.m" -o -name "*.mm" \) | sed -e 's;/[^/]*$;;' | sort -u | sed -e 's/\(^\| \)X[^ ]*//g'`
SRCDIRS=`find $TESTDIR \( -name "*.m" -o -name "*.mm" -o -name "*.c" -o -name "*.cc" \) | sed -e 's;/[^/]*$;;' | sort -u | sed -e 's/\(^\| \)X[^ ]*//g'`
fi
else
SRCDIRS="$TESTDIRS"
@ -523,10 +543,10 @@ do
if test x"$OBJCXX" = x
then
# Only Objective-C (and C)
TESTS=`find . \( -name . -o -prune \) -name "*.m" | sed -e 's;^.*/;;' | sort -u | sed -e 's/\(^\| \)X[^ ]*//g'`
TESTS=`find . \( -name . -o -prune \) \( -name "*.m" -o -name "*.c" \) | sed -e 's;^.*/;;' | sort -u | sed -e 's/\(^\| \)X[^ ]*//g'`
else
# Objective-C and Objective-C++ (implicitly C and C++ too)
TESTS=`find . \( -name . -o -prune \) \( -name "*.m" -o -name "*.mm" \) | sed -e 's;^.*/;;' | sort -u | sed -e 's/\(^\| \)X[^ ]*//g'`
TESTS=`find . \( -name . -o -prune \) \( -name "*.m" -o -name "*.mm" -name "*.c" -o -name "*.cc" \) | sed -e 's;^.*/;;' | sort -u | sed -e 's/\(^\| \)X[^ ]*//g'`
fi
fi
@ -572,8 +592,21 @@ do
if test x"$tmp" = x"$TESTFILE"
then
tmp=`basename $TESTFILE .mm`
TESTRULES="$TESTRULES\\
if test x"$tmp" = x"$TESTFILE"
then
tmp=`basename $TESTFILE .c`
if test x"$tmp" = x"$TESTFILE"
then
TESTRULES="$TESTRULES\\
${tmp}_CC_FILES=$TESTFILE"
else
TESTRULES="$TESTRULES\\
${tmp}_C_FILES=$TESTFILE"
fi
else
TESTRULES="$TESTRULES\\
${tmp}_OBJCC_FILES=$TESTFILE"
fi
else
TESTRULES="$TESTRULES\\
${tmp}_OBJC_FILES=$TESTFILE"