Author: rfm
Date: Sat May 14 11:13:47 2016
New Revision: 39761
URL: http://svn.gna.org/viewcvs/gnustep?rev=39761&view=rev
Log:
avoid a few warnings
Modified:
tools/make/trunk/ChangeLog
tools/make/trunk/TestFramework/Summary.sh
tools/make/trunk/TestFramework/gnustep-tests.in
Modified: tools/make/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/ChangeLog?rev=39761&r1=39760&r2=39761&view=diff
==============================================================================
--- tools/make/trunk/ChangeLog (original)
+++ tools/make/trunk/ChangeLog Sat May 14 11:13:47 2016
@@ -1,3 +1,9 @@
+2016-05-13 Richard Frith-Macdonald <[email protected]>
+
+ * TestFramework/Summary.sh:
+ * TestFramework/gnustep-tests.in:
+ Avoid some pointless warnings when cleaning
+
2016-05-13 Yavor Doganov <[email protected]>
* Instance/framework.make:
Modified: tools/make/trunk/TestFramework/Summary.sh
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/TestFramework/Summary.sh?rev=39761&r1=39760&r2=39761&view=diff
==============================================================================
--- tools/make/trunk/TestFramework/Summary.sh (original)
+++ tools/make/trunk/TestFramework/Summary.sh Sat May 14 11:13:47 2016
@@ -35,75 +35,77 @@
return 1
}
-present "$GSTESTSUM" "Failed set$" "Failed sets$" "Failed test$" "Failed
tests$" "Failed build$" "Failed builds$" "Failed file$" "Failed files$"
-if [ $? = 1 ]
-then
- echo "All OK!"
+if test -r "$GSTESTSUM"
+then
+ present "$GSTESTSUM" "Failed set$" "Failed sets$" "Failed test$" "Failed
tests$" "Failed build$" "Failed builds$" "Failed file$" "Failed files$"
+ if [ $? = 1 ]
+ then
+ echo "All OK!"
- if present "$GSTESTSUM" "Dashed hope$" "Dashed hopes$"
- then
- echo
- echo "But we were hoping that even more tests might have passed if"
- echo "someone had added support for them to the package. If you"
- echo "would like to help, please contact the package maintainer."
+ if present "$GSTESTSUM" "Dashed hope$" "Dashed hopes$"
+ then
+ echo
+ echo "But we were hoping that even more tests might have passed if"
+ echo "someone had added support for them to the package. If you"
+ echo "would like to help, please contact the package maintainer."
+ fi
+
+ if present "$GSTESTSUM" "Skipped set$" "Skipped sets$"
+ then
+ echo
+ echo "Even though no tests failed, we had to skip some testing"
+ echo "due to lack of support on your system. This might be because"
+ echo "some required software library was just not available when the"
+ echo "software was built (in which case you can install that library"
+ echo "and rebuild, then re-run the tests), or the required functions"
+ echo "may not be available on your operating system at all."
+ echo "Please see $GSTESTLOG for more detail."
+ echo "If you would like to contribute code to add the missing"
+ echo "functionality, please contact the package maintainer."
+ fi
+
+ else
+ if [ "$GSTESTMODE" = "failfast" ]
+ then
+ exit 0
+ fi
+
+ if present "$GSTESTSUM" "Failed build$" "Failed build$"
+ then
+ echo
+ echo "Unfortunately we could not even compile all the test programs."
+ echo "This means that the test could not be run properly, and you need"
+ echo "to try to figure out why and fix it or ask for help."
+ fi
+
+ if present "$GSTESTSUM" "Failed file$" "Failed files$"
+ then
+ echo
+ echo "Some testing was abandoned when a test program aborted. This is"
+ echo "generally a severe problem and may mean that the package is"
+ echo "completely unusable. You need to try to fix this and, if it is"
+ echo "not due to some problem on your system, please help by submitting"
+ echo "a patch (or at least a bug report) to the package maintainer."
+ fi
+
+ if present "$GSTESTSUM" "Failed set$" "Failed sets$"
+ then
+ echo
+ echo "Some set of tests failed. This could well mean that a large"
+ echo "number of individual tests did not pass and that there are"
+ echo "severe problems in the software."
+ echo "Please submit a patch to fix the problem or send a bug report to"
+ echo "the package maintainer."
+ fi
+
+ if present "$GSTESTSUM" "Failed test$" "Failed tests$"
+ then
+ echo
+ echo "One or more tests failed. None of them should have."
+ echo "Please submit a patch to fix the problem or send a bug report to"
+ echo "the package maintainer."
+ fi
+
+ echo "Please see $GSTESTLOG for more detail."
fi
-
- if present "$GSTESTSUM" "Skipped set$" "Skipped sets$"
- then
- echo
- echo "Even though no tests failed, we had to skip some testing"
- echo "due to lack of support on your system. This might be because"
- echo "some required software library was just not available when the"
- echo "software was built (in which case you can install that library"
- echo "and rebuild, then re-run the tests), or the required functions"
- echo "may not be available on your operating system at all."
- echo "Please see $GSTESTLOG for more detail."
- echo "If you would like to contribute code to add the missing"
- echo "functionality, please contact the package maintainer."
- fi
-
-else
- if [ "$GSTESTMODE" = "failfast" ]
- then
- exit 0
- fi
-
- if present "$GSTESTSUM" "Failed build$" "Failed build$"
- then
- echo
- echo "Unfortunately we could not even compile all the test programs."
- echo "This means that the test could not be run properly, and you need"
- echo "to try to figure out why and fix it or ask for help."
- fi
-
- if present "$GSTESTSUM" "Failed file$" "Failed files$"
- then
- echo
- echo "Some testing was abandoned when a test program aborted. This is"
- echo "generally a severe problem and may mean that the package is"
- echo "completely unusable. You need to try to fix this and, if it is"
- echo "not due to some problem on your system, please help by submitting"
- echo "a patch (or at least a bug report) to the package maintainer."
- fi
-
- if present "$GSTESTSUM" "Failed set$" "Failed sets$"
- then
- echo
- echo "Some set of tests failed. This could well mean that a large"
- echo "number of individual tests did not pass and that there are"
- echo "severe problems in the software."
- echo "Please submit a patch to fix the problem or send a bug report to"
- echo "the package maintainer."
- fi
-
- if present "$GSTESTSUM" "Failed test$" "Failed tests$"
- then
- echo
- echo "One or more tests failed. None of them should have."
- echo "Please submit a patch to fix the problem or send a bug report to"
- echo "the package maintainer."
- fi
-
- echo "Please see $GSTESTLOG for more detail."
fi
-
Modified: tools/make/trunk/TestFramework/gnustep-tests.in
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/TestFramework/gnustep-tests.in?rev=39761&r1=39760&r2=39761&view=diff
==============================================================================
--- tools/make/trunk/TestFramework/gnustep-tests.in (original)
+++ tools/make/trunk/TestFramework/gnustep-tests.in Sat May 14 11:13:47 2016
@@ -772,10 +772,15 @@
rm -f tests.tmp tests.sum.tmp tests.log.tmp
# Our exit status is 0 unless some test failed.
-present "$GSTESTSUM" "Failed set$" "Failed sets$" "Failed test$" "Failed
tests$" "Failed build$" "Failed builds$" "Failed file$" "Failed files$"
-if [ $? = 1 ]
-then
+if test -r "$GSTESTSUM"
+then
+ present "$GSTESTSUM" "Failed set$" "Failed sets$" "Failed test$" "Failed
tests$" "Failed build$" "Failed builds$" "Failed file$" "Failed files$"
+ if [ $? = 1 ]
+ then
+ exit 0
+ else
+ exit 1
+ fi
+else
exit 0
-else
- exit 1
-fi
+fi
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
