From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 29 Feb 2024 19:52:21 +0000 (-0500)
Subject: Tests: namespace TAP_AUTOTIME under LTTNG_TESTS
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=83dc3923fa4b0fc2e0ad091392aea64cac046498;p=lttng-tools.git

Tests: namespace TAP_AUTOTIME under LTTNG_TESTS

Test suite variables that are user exposed are usually namespaced under
the 'LTTNG_TESTS_' prefix.

Change-Id: I7ec31efa08050460e2a1e274ef35889b97768f87
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/utils/lttngtest/tap_generator.py b/tests/utils/lttngtest/tap_generator.py
index e3d61e688..75960aece 100644
--- a/tests/utils/lttngtest/tap_generator.py
+++ b/tests/utils/lttngtest/tap_generator.py
@@ -86,7 +86,7 @@ class TapGenerator:
         self._printed_plan = False  # type: bool
         self._has_failure = False  # type: bool
         self._time_tests = True  # type: bool
-        if os.getenv("TAP_AUTOTIME", "1") == "0":
+        if os.getenv("LTTNG_TESTS_TAP_AUTOTIME", "1") == "0":
             self._time_tests = False
         self._last_time = _get_time_ns()
 
diff --git a/tests/utils/tap-driver.sh b/tests/utils/tap-driver.sh
index 9baa4d923..56d4d3e45 100755
--- a/tests/utils/tap-driver.sh
+++ b/tests/utils/tap-driver.sh
@@ -150,7 +150,7 @@ TIME_SCRIPT="$(realpath -e -- "$(dirname "$0")")/tap/clock"
     # the outputs in the resulting file for half written lines, eg.
     #   ok 93 - Tes# PERROR - xxxx
     #   t some function
-    if [ "${TAP_AUTOTIME:-}" != 0 ]; then
+    if [ "${LTTNG_TESTS_TAP_AUTOTIME:-}" != 0 ]; then
       stdbuf -eL -oL -- "$@"
     else
       "$@"
diff --git a/tests/utils/tap/tap.c b/tests/utils/tap/tap.c
index c92c14140..687ea22f2 100644
--- a/tests/utils/tap/tap.c
+++ b/tests/utils/tap/tap.c
@@ -185,16 +185,16 @@ void _tap_init(void)
 		setbuf(stdout, 0);
 
 		/*
-		 * Check if the TAP_AUTOTIME environment variable is set and
-		 * contains at least one byte.
+		 * Check if the LTTNG_TESTS_TAP_AUTOTIME environment variable
+		 * is set and contains at least one byte.
 		 */
-		const char *autotime_env = getenv("TAP_AUTOTIME");
+		const char *autotime_env = getenv("LTTNG_TESTS_TAP_AUTOTIME");
 		if (autotime_env != NULL && strnlen(autotime_env, 1)) {
 			int tap_autotime;
 
 			/*
-			 * Check if TAP_AUTOTIME is '0', also check errno
-			 * because strtol() can return '0' on error.
+			 * Check if LTTNG_TESTS_TAP_AUTOTIME is '0', also check
+			 * errno because strtol() can return '0' on error.
 			 */
 			errno = 0;
 			tap_autotime = strtol(autotime_env, NULL, 10);
diff --git a/tests/utils/tap/tap.sh b/tests/utils/tap/tap.sh
index 66499d817..eae7c3a2c 100755
--- a/tests/utils/tap/tap.sh
+++ b/tests/utils/tap/tap.sh
@@ -14,7 +14,7 @@ _test_died=0
 _expected_tests=0
 _executed_tests=0
 _failed_tests=0
-_auto_timing="${TAP_AUTOTIME:-1}"
+_auto_timing="${LTTNG_TESTS_TAP_AUTOTIME:-1}"
 _last_time=''
 TODO=
 TIME_SCRIPT="$(realpath -e -- "$(dirname "${BASH_SOURCE[0]}")")/clock"
diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py
index d87cd1e32..7d8dc6819 100644
--- a/tests/utils/test_utils.py
+++ b/tests/utils/test_utils.py
@@ -24,7 +24,7 @@ sys.path.append(lttng_bindings_libs_path)
 from lttng import *
 
 _time_tests = True
-if os.getenv("TAP_AUTOTIME", "1") == "0":
+if os.getenv("LTTNG_TESTS_TAP_AUTOTIME", "1") == "0":
     _time_tests = False