From: Karel Zak <kzak@redhat.com>
Date: Fri, 22 Nov 2019 13:21:20 +0000 (+0100)
Subject: tests: make scriptlive output more portable
X-Git-Tag: v2.35-rc1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53ea212dca78138f9acd4c1c9ffd7a677f505971;p=thirdparty%2Futil-linux.git

tests: make scriptlive output more portable

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/expected/script/replay-live b/tests/expected/script/replay-live
index 1ea64cf8e6..cc68a18048 100644
--- a/tests/expected/script/replay-live
+++ b/tests/expected/script/replay-live
@@ -1,7 +1,7 @@
 >>> scriptlive: Starting your typescript execution by sh --posix.
 echo "result is $(($NUMBER + 1))"
-$ echo "result is $(($NUMBER + 1))"
+prompt> echo "result is $(($NUMBER + 1))"
 result is 124
-$ exit
+prompt> exit
 
 >>> scriptlive: done.
diff --git a/tests/ts/script/replay b/tests/ts/script/replay
index fc8e80d849..7c6bd201fc 100755
--- a/tests/ts/script/replay
+++ b/tests/ts/script/replay
@@ -91,7 +91,7 @@ NUMBER=123 $TS_CMD_SCRIPTLIVE \
 	--command 'sh --posix' \
 	--log-in "$LOG_IN_FILE" \
 	--log-timing "$TIMING_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG
-sed -i 's/sh-[[:alnum:]\.]*//g' $TS_OUTPUT
+sed -i 's/sh-[[:alnum:]\.\$\#]*/prompt>/g' $TS_OUTPUT
 ts_finalize_subtest
 
 ts_finalize