tests: use -z / -n to test for string empty / non-empty

[babeltrace.git] / tests / utils / env.sh.in

diff --git a/tests/utils/env.sh.in b/tests/utils/env.sh.in
index af34046b822ca250d0564e8e27109bcea5b725c9..ab5b47e783714804a7ed747e165cddd328c88cc3 100644 (file)
--- a/tests/utils/env.sh.in
+++ b/tests/utils/env.sh.in
@@ -4,39 +4,52 @@
 #
 
 ### Base paths to test suite ###
-if [ "x${BT_TESTS_SRCDIR:-}" = "x" ]; then
+if [ -z "${BT_TESTS_SRCDIR:-}" ]; then
        BT_TESTS_SRCDIR="@abs_top_srcdir@/tests"
 fi
 export BT_TESTS_SRCDIR
 
-if [ "x${BT_TESTS_BUILDDIR:-}" = "x" ]; then
+if [ -z "${BT_TESTS_BUILDDIR:-}" ]; then
        BT_TESTS_BUILDDIR="@abs_top_builddir@/tests"
 fi
 export BT_TESTS_BUILDDIR
 
 
 ### External Tools ###
-if [ "x${BT_TESTS_AWK_BIN:-}" = "x" ]; then
+if [ -z "${BT_TESTS_AWK_BIN:-}" ]; then
        BT_TESTS_AWK_BIN="@AWK@"
 fi
 export BT_TESTS_AWK_BIN
 
-if [ "x${BT_TESTS_GREP_BIN:-}" = "x" ]; then
+if [ -z "${BT_TESTS_GREP_BIN:-}" ]; then
        BT_TESTS_GREP_BIN="@GREP@"
 fi
 export BT_TESTS_GREP_BIN
 
-if [ "x${BT_TESTS_PYTHON_BIN:-}" = "x" ]; then
+if [ -z "${BT_TESTS_PYTHON_BIN:-}" ]; then
        BT_TESTS_PYTHON_BIN="@PYTHON@"
 fi
 export BT_TESTS_PYTHON_BIN
 
-if [ "x${BT_TESTS_PYTHON_CONFIG_BIN:-}" = "x" ]; then
+if [ -z "${BT_TESTS_PYTHON_CONFIG_BIN:-}" ]; then
        BT_TESTS_PYTHON_CONFIG_BIN="@PYTHON_CONFIG@"
 fi
 export BT_TESTS_PYTHON_CONFIG_BIN
 
-if [ "x${BT_TESTS_SED_BIN:-}" = "x" ]; then
+if [ -z "${BT_TESTS_SED_BIN:-}" ]; then
        BT_TESTS_SED_BIN="@SED@"
 fi
 export BT_TESTS_SED_BIN
+
+if [ -z "${BT_TESTS_CC_BIN:-}" ]; then
+       BT_TESTS_CC_BIN="@CC@"
+fi
+export BT_TESTS_CC_BIN
+
+
+### Optional features ###
+
+if [ -z "${BT_TESTS_ENABLE_ASAN:-}" ]; then
+       BT_TESTS_ENABLE_ASAN="@ENABLE_ASAN@"
+fi
+export BT_TESTS_ENABLE_ASAN