fix error running tests on single line

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32405 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-02-28 12:17:47 +00:00
parent ffef359409
commit 24748f845b
3 changed files with 18 additions and 4 deletions

View file

@ -1,3 +1,9 @@
2011-01-28 Richard Frith-Macdonald <rfm@gnu.org>
* TestFramework/gnustep-tests.in:
* TestFramework/GNUmakefile.in:
Fix error testing single file ... was trying subdirectories too.
2011-01-25 Richard Frith-Macdonald <rfm@gnu.org>
* TestFramework/example9.m: Fix include

View file

@ -16,6 +16,9 @@ endif
@TESTRULES@
clean::
rm -f core tests.log tests.sum oldtests.log oldtests.sum
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/test-tool.make
-include GNUmakefile.postamble

View file

@ -186,7 +186,7 @@ then
BARE=`basename $TESTS .mm`
if test x"$BARE" = x"$TESTS"
then
echo "The file '$1' does not have a .m or .mm extension ... cannot test."
echo "The file '$1' does not end in .m or .mm ... cannot test."
exit 1
fi
fi
@ -384,8 +384,13 @@ SUMD=.
for TESTDIR in $TESTDIRS
do
found=no
# Get the names of all subdirectories containing source files.
SRCDIRS=`find $TESTDIR \( -name "*.m" -o -name "*.mm" \) | sed -e 's;/[^/]*$;;' | sort -u | sed -e 's/\(^\| \)X[^ ]*//g'`
if test x"$TESTS" = x
then
# Get the names of all subdirectories containing source files.
SRCDIRS=`find $TESTDIR \( -name "*.m" -o -name "*.mm" \) | sed -e 's;/[^/]*$;;' | sort -u | sed -e 's/\(^\| \)X[^ ]*//g'`
else
SRCDIRS="$TESTDIRS"
fi
if test x"$SRCDIRS" = x
then
continue
@ -411,7 +416,7 @@ do
fi
fi
# Get the names of all the .m and .mm files in the curret directory.
# Get the names of all the .m and .mm files in the current directory.
if test x"$TESTS" = x
then
TESTS=`find . \( -name . -o -prune \) \( -name "*.m" -o -name "*.mm" \) | sed -e 's;^.*/;;' | sort -u | sed -e 's/\(^\| \)X[^ ]*//g'`