Author: rfm
Date: Tue Oct 20 08:44:08 2015
New Revision: 39081
URL: http://svn.gna.org/viewcvs/gnustep?rev=39081&view=rev
Log:
Deprecate use of unnecessary Env.sh
Modified:
tools/make/trunk/ChangeLog
tools/make/trunk/TestFramework/README
tools/make/trunk/TestFramework/gnustep-tests.in
Modified: tools/make/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/ChangeLog?rev=39081&r1=39080&r2=39081&view=diff
==============================================================================
--- tools/make/trunk/ChangeLog (original)
+++ tools/make/trunk/ChangeLog Tue Oct 20 08:44:08 2015
@@ -1,3 +1,8 @@
+2015-11-20 Richard Frith-Macdonald <[email protected]>
+
+ * TestFramework/gnustep-tests.in: Deprecate Env.sh ... use TestInfo to
+ set test ewnvironment
+
2015-09-23 Germán Arias <[email protected]>
* Documentation/README.MinGW: Fix errors in services path.
Modified: tools/make/trunk/TestFramework/README
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/TestFramework/README?rev=39081&r1=39080&r2=39081&view=diff
==============================================================================
--- tools/make/trunk/TestFramework/README (original)
+++ tools/make/trunk/TestFramework/README Tue Oct 20 08:44:08 2015
@@ -306,7 +306,7 @@
All directories which contain test files must also contain a TestInfo file
to mark them as containing files used by the framework, and the root of
the test suite is considered to be the topmost directory in the hierarchy
-which contains a testInfo file. The test framework sets the GSTESTROOT
+which contains a TestInfo file. The test framework sets the GSTESTROOT
environment variable to the absolute path of the root of the test suite
being executed, so scripts and makefiles can use this to locate resources.
@@ -317,6 +317,11 @@
build resources for tests in subdirectories which are ignored by the
test framework itself.
+In addition to being a marker, the TestInfo file is a shell script which
+is sourced before execution of each test program in its directory, typically
+it is used to set up environment variables (eg. LD_LIBRARY_PATH to tell the
+program where to find dynamic libraries the tests use).
+
Providing extra control and information
---------------------------------------
@@ -336,11 +341,6 @@
special phrases generated to mark a passed test or a particular type of
failure.
-If an Env.sh script is present in a test directory, then it will be
-sourced immediately before each test in order to allow you to set up
-special environment variables for the test. This script should produce
-no output.
-
If a Summary.sh file is present in a test directory and gnustep-tests is
used to run just those tests in that directory, the shell script will be
executed in order to provide the summary of the test results. In all other
Modified: tools/make/trunk/TestFramework/gnustep-tests.in
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/TestFramework/gnustep-tests.in?rev=39081&r1=39080&r2=39081&view=diff
==============================================================================
--- tools/make/trunk/TestFramework/gnustep-tests.in (original)
+++ tools/make/trunk/TestFramework/gnustep-tests.in Tue Oct 20 08:44:08 2015
@@ -381,11 +381,12 @@
# Run it. If it terminates abnormally, mark it as a crash (unless we have
# a special file to mark it as being expected to abort).
+ # Env.sh is deprecated ... we should only use TestInfo to setup for a test
if test -r ./Env.sh
then
( . ./Env.sh; $RUN_CMD )
else
- $RUN_CMD
+ ( . ./TestInfo; $RUN_CMD )
fi
if test $? != 0
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
