From e2ed6baf43c89ab4fe54dd8ea245c20b4fdb207f Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Wed, 3 Apr 2019 16:47:05 -0700 Subject: [PATCH] Make the output/errput test more robust by sorting output --- tests/test1.in | 2 +- tests/test1.out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test1.in b/tests/test1.in index 41fc71caa..51302c2a3 100644 --- a/tests/test1.in +++ b/tests/test1.in @@ -110,7 +110,7 @@ echo Test 5 $sta logmsg Verify that we can turn stderr into stdout and then pipe it # Note that the order here has historically been unspecified - 'errput' could conceivably appear before 'output'. -begin ; echo output ; echo errput 1>&2 ; end 2>&1 | tee ../test/temp/tee_test.txt ; cat ../test/temp/tee_test.txt +begin ; echo output ; echo errput 1>&2 ; end 2>&1 | sort | tee ../test/temp/tee_test.txt ; cat ../test/temp/tee_test.txt logmsg "Test that trailing ^ doesn't trigger redirection, see #1873" echo caret_no_redirect 12345^ diff --git a/tests/test1.out b/tests/test1.out index 8ac15efc6..6c141412d 100644 --- a/tests/test1.out +++ b/tests/test1.out @@ -44,10 +44,10 @@ Test 5 pass #################### # Verify that we can turn stderr into stdout and then pipe it -output errput output errput +output #################### # Test that trailing ^ doesn't trigger redirection, see #1873