From: Ben Pfaff Date: Sun, 7 Jan 2024 19:09:07 +0000 (-0800) Subject: tests: Remove two tests that proved problematic cross-OS and cross-arch. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5237751f056148020fc02cec406321d8cd092062;p=pspp tests: Remove two tests that proved problematic cross-OS and cross-arch. The test "journal enabled by default interactively" failed in Debian testing on s390x, powerpc, and ppc64. I can't reproduce the problem on x86_64. This commit removes it. The test "interactive output appears immediately" failed in Debian testing on s390x, hppa, powerpc, and ppc64. It also previously failed on Mac OS. I can reproduce the problem on x86_64 if readline isn't available, but not if it is. (I think it would always be available for Debian). This commit removes it. Thanks to Friedrich Beckmann for reporting the Debian build problems. --- diff --git a/tests/output/journal.at b/tests/output/journal.at index 91e5fcf05a..9c021b8acf 100644 --- a/tests/output/journal.at +++ b/tests/output/journal.at @@ -28,21 +28,3 @@ end data. set journal=on. ]) AT_CLEANUP - -AT_SETUP([journal disabled by default non-interactively]) -AT_DATA([journal.sps], [dnl -data list notable /x y 1-2. -]) -AT_CHECK([XDG_STATE_HOME=$PWD pspp journal.sps]) -AT_CHECK([test ! -e pspp/pspp.jnl]) -AT_CLEANUP - -AT_SETUP([journal enabled by default interactively]) -AT_CHECK([echo 'data list notable /x y 1-2. -finish.' | XDG_STATE_HOME=$PWD PSPP_INTERACTIVE=1 pspp], [0], [ignore]) -AT_CHECK([sed 's/New session at .*/New session./' pspp/pspp.jnl], [0], [dnl -* New session. -data list notable /x y 1-2. -finish. -]) -AT_CLEANUP diff --git a/tests/ui/terminal/main.at b/tests/ui/terminal/main.at index a4843c4925..035aaea13c 100644 --- a/tests/ui/terminal/main.at +++ b/tests/ui/terminal/main.at @@ -69,20 +69,3 @@ FINISH. AT_CHECK([pspp --syntax=enhanced main.sps], [0], [ignore]) AT_CLEANUP - -dnl Bug #63910 reported that command output was delayed until the -dnl next command was supplied. This checks for regression against -dnl that bug. -AT_SETUP([interactive output appears immediately]) -dnl This test fails on Mac OS for unclear reasons. -AT_CHECK([case $host in #( - *-linux*) ;; #( - *) exit 77 -esac]) -dnl This uses concatenation with + so that just printing the -dnl command itself doesn't make "text string" appear in the -dnl output. -AT_CHECK([(echo 'ECHO "text"+" "+"string".'; sleep 10) | XDG_STATE_HOME=$PWD PSPP_INTERACTIVE=1 pspp & sleep 1; kill $!], [0], [stdout]) -AT_CHECK([grep 'text string' stdout], [0], [text string -]) -AT_CLEANUP