Deprecate use of unnecessary Env.sh

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@39081 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2015-10-20 06:44:08 +00:00
parent 74c0a3a71d
commit 92418cccc1
3 changed files with 13 additions and 7 deletions

View file

@ -1,3 +1,8 @@
2015-11-20 Richard Frith-Macdonald <rfm@gnu.org>
* TestFramework/gnustep-tests.in: Deprecate Env.sh ... use TestInfo to
set test ewnvironment
2015-09-23 Germán Arias <germanandre@gmx.es>
* Documentation/README.MinGW: Fix errors in services path.

View file

@ -306,7 +306,7 @@ a single directory or a collection of directories in a hierarchy.
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 @@ various makefile options listed above ... the makefiles may be used to
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 @@ log ... so you need to avoid starting a line in the log with any of the
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

View file

@ -381,11 +381,12 @@ build_and_run ()
# 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