Remove environment variable. Add 'set -x' to print trace of commands

This commit is contained in:
Shahram Najm 2018-08-15 12:00:07 +01:00
parent a8f38209ef
commit 76fd217e70
8 changed files with 9 additions and 49 deletions

View File

@ -1,11 +1,6 @@
# examples/C include file for CMake # examples/C include file for CMake
set -ea set -eax
# If this environment variable is set, then become verbose
# so one can see why and how a test failed
if test "x$ECCODES_TEST_VERBOSE_OUTPUT" != "x"; then
set -x
fi
proj_dir=@PROJECT_SOURCE_DIR@ proj_dir=@PROJECT_SOURCE_DIR@
data_dir=@PROJECT_BINARY_DIR@/data data_dir=@PROJECT_BINARY_DIR@/data

View File

@ -16,12 +16,7 @@ else
# This is for autotools # This is for autotools
echo echo
echo "TEST: $0" echo "TEST: $0"
set -x
# If this environment variable is set, then become verbose
# so one can see why and how a test failed
if test "x$ECCODES_TEST_VERBOSE_OUTPUT" != "x"; then
set -x
fi
if [ -z "${data_dir}" ] if [ -z "${data_dir}" ]
then then

View File

@ -1,11 +1,6 @@
# examples/F90 include file for CMake # examples/F90 include file for CMake
set -ea set -eax
# If this environment variable is set, then become verbose
# so one can see why and how a test failed
if test "x$ECCODES_TEST_VERBOSE_OUTPUT" != "x"; then
set -x
fi
proj_dir=@PROJECT_SOURCE_DIR@ proj_dir=@PROJECT_SOURCE_DIR@
data_dir=@PROJECT_BINARY_DIR@/data data_dir=@PROJECT_BINARY_DIR@/data

View File

@ -12,17 +12,11 @@ if [ -f "$CMAKE_INCLUDE_FILE" ]; then
. ./$CMAKE_INCLUDE_FILE . ./$CMAKE_INCLUDE_FILE
else else
set -ea set -eax
echo echo
echo "TEST: $0" echo "TEST: $0"
# If this environment variable is set, then become verbose
# so one can see why and how a test failed
if test "x$ECCODES_TEST_VERBOSE_OUTPUT" != "x"; then
set -x
fi
if [ -z "${data_dir}" ] if [ -z "${data_dir}" ]
then then
cd ../../ cd ../../

View File

@ -1,11 +1,6 @@
# examples/python include file for CMake # examples/python include file for CMake
set -ea set -eax
# If this environment variable is set, then become verbose
# so one can see why and how a test failed
if test "x$ECCODES_TEST_VERBOSE_OUTPUT" != "x"; then
set -x
fi
data_dir=@PROJECT_BINARY_DIR@/data data_dir=@PROJECT_BINARY_DIR@/data

View File

@ -4,16 +4,10 @@ if [ -f "$CMAKE_INCLUDE_FILE" ]; then
. ./$CMAKE_INCLUDE_FILE . ./$CMAKE_INCLUDE_FILE
else else
set -ea set -eax
echo echo
echo "TEST: $0" echo "TEST: $0"
# If this environment variable is set, then become verbose
# so one can see why and how a test failed
if test "x$ECCODES_TEST_VERBOSE_OUTPUT" != "x"; then
set -x
fi
cpath=$TOPBUILDDIR cpath=$TOPBUILDDIR
ECCODES_DEFINITION_PATH=$cpath/definitions ECCODES_DEFINITION_PATH=$cpath/definitions
export ECCODES_DEFINITION_PATH export ECCODES_DEFINITION_PATH

View File

@ -1,11 +1,7 @@
set -ea set -ea
# For CMake # For CMake
# If this environment variable is set, then become verbose set -x
# so one can see why and how a test failed
if test "x$ECCODES_TEST_VERBOSE_OUTPUT" != "x"; then
set -x
fi
proj_dir=@PROJECT_SOURCE_DIR@ proj_dir=@PROJECT_SOURCE_DIR@
data_dir=@PROJECT_BINARY_DIR@/data data_dir=@PROJECT_BINARY_DIR@/data
@ -20,7 +16,7 @@ tools_dir=@CMAKE_BINARY_DIR@/bin
tigge_dir=@CMAKE_BINARY_DIR@/bin tigge_dir=@CMAKE_BINARY_DIR@/bin
# If this environment variable is set, then run the # If this environment variable is set, then run the
# executables with valgrind # test executables with valgrind
if test "x$ECCODES_TEST_WITH_VALGRIND" != "x"; then if test "x$ECCODES_TEST_WITH_VALGRIND" != "x"; then
tools_dir="valgrind --error-exitcode=1 -q @CMAKE_BINARY_DIR@/bin" tools_dir="valgrind --error-exitcode=1 -q @CMAKE_BINARY_DIR@/bin"
fi fi

View File

@ -24,11 +24,7 @@ else
# save current working dir # save current working dir
save=`pwd` save=`pwd`
# If this environment variable is set, then become verbose set -x
# so one can see why and how a test failed
if test "x$ECCODES_TEST_VERBOSE_OUTPUT" != "x"; then
set -x
fi
if [ -z "${data_dir}" ] if [ -z "${data_dir}" ]
then then