[LTP] Remove GRAMINE_LTP_LIVE_OUTPUT

Since the output shown after a test failure now contains timestamps, there is no point to showing the logs of specific tests live. This reverts the relevant part of the commit "[LTP] Run timeout-prone tests with unbufferred output". Signed-off-by: Jakub Kądziołka <[email protected]>
amicrity · Jul 1, 2022 · 918fd0d · 918fd0d
1 parent d92a7f1
commit 918fd0d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/.ci/lib/stage-test-direct.jenkinsfile b/.ci/lib/stage-test-direct.jenkinsfile
@@ -9,7 +9,6 @@ stage('test-direct') {
             // separately
             sh '''
                 cd libos/test/ltp
-                export GRAMINE_LTP_LIVE_OUTPUT=fcntl14,fdatasync01
                 python3 -m pytest -v -n4 --junit-xml=ltp.xml
             '''
         }

diff --git a/libos/test/ltp/test_ltp.py b/libos/test/ltp/test_ltp.py
@@ -183,7 +183,7 @@ def check_must_pass(passed, failed, must_pass):
         pytest.fail('All subtests skipped, replace must-pass with skip')
 
 
-def test_ltp(cmd, section, capsys):
+def test_ltp(cmd, section):
     must_pass = section.getintset('must-pass')
 
     loader = 'gramine-sgx' if HAS_SGX else 'gramine-direct'
@@ -193,12 +193,7 @@ def test_ltp(cmd, section, capsys):
     logging.info('command: %s', full_cmd)
     logging.info('must_pass: %s', list(must_pass) if must_pass else 'all')
 
-    live_output = os.getenv('GRAMINE_LTP_LIVE_OUTPUT') or ''
-    if section.name in live_output.split(','):
-        with capsys.disabled():
-            returncode, stdout, _stderr = run_command(full_cmd, timeout=timeout, can_fail=True)
-    else:
-        returncode, stdout, _stderr = run_command(full_cmd, timeout=timeout, can_fail=True)
+    returncode, stdout, _stderr = run_command(full_cmd, timeout=timeout, can_fail=True)
 
     # Parse output regardless of whether `must_pass` is specified: unfortunately some tests
     # do not exit with non-zero code when failing, because they rely on `MAP_SHARED` (which