From 2a561b66f48ab4deafb0a031cad3ad541ea79449 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 16 Aug 2017 17:44:34 -0400 Subject: tests: Remove unnecessary sort-args.sh invocations --- tests.sh | 4 ++-- tests/test_exec_plus_semicolon.out | 38 +++++++++++++++++------------------ tests/test_execdir_plus_semicolon.out | 38 +++++++++++++++++------------------ 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/tests.sh b/tests.sh index 9dc0c65..a23b5bb 100755 --- a/tests.sh +++ b/tests.sh @@ -840,7 +840,7 @@ function test_exec_plus_semicolon() { # Only a that immediately follows an argument containing only the two characters "{}" # shall punctuate the end of the primary expression. Other uses of the shall not be # treated as special. - bfs_diff basic -exec "$TESTS/sort-args.sh" foo '{}' bar + baz \; + bfs_diff basic -exec echo foo '{}' bar + baz \; } function test_exec_substring() { @@ -860,7 +860,7 @@ function test_execdir_substring() { } function test_execdir_plus_semicolon() { - bfs_diff basic -execdir "$TESTS/sort-args.sh" foo '{}' bar + baz \; + bfs_diff basic -execdir echo foo '{}' bar + baz \; } function test_execdir_pwd() { diff --git a/tests/test_exec_plus_semicolon.out b/tests/test_exec_plus_semicolon.out index 27887e2..3805261 100644 --- a/tests/test_exec_plus_semicolon.out +++ b/tests/test_exec_plus_semicolon.out @@ -1,19 +1,19 @@ -+ bar basic baz foo -+ bar basic/a baz foo -+ bar basic/b baz foo -+ bar basic/c baz foo -+ bar basic/e baz foo -+ bar basic/g baz foo -+ bar basic/i baz foo -+ bar basic/j baz foo -+ bar basic/k baz foo -+ bar basic/l baz foo -+ bar basic/c/d baz foo -+ bar basic/e/f baz foo -+ bar basic/g/h baz foo -+ bar basic/j/foo baz foo -+ bar basic/k/foo baz foo -+ bar basic/l/foo baz foo -+ bar basic/k/foo/bar baz foo -+ bar basic/l/foo/bar baz foo -+ bar basic/l/foo/bar/baz baz foo +foo basic bar + baz +foo basic/a bar + baz +foo basic/b bar + baz +foo basic/c bar + baz +foo basic/e bar + baz +foo basic/g bar + baz +foo basic/i bar + baz +foo basic/j bar + baz +foo basic/k bar + baz +foo basic/l bar + baz +foo basic/c/d bar + baz +foo basic/e/f bar + baz +foo basic/g/h bar + baz +foo basic/j/foo bar + baz +foo basic/k/foo bar + baz +foo basic/l/foo bar + baz +foo basic/k/foo/bar bar + baz +foo basic/l/foo/bar bar + baz +foo basic/l/foo/bar/baz bar + baz diff --git a/tests/test_execdir_plus_semicolon.out b/tests/test_execdir_plus_semicolon.out index 9acfc5d..e39f452 100644 --- a/tests/test_execdir_plus_semicolon.out +++ b/tests/test_execdir_plus_semicolon.out @@ -1,19 +1,19 @@ -+ ./a bar baz foo -+ ./b bar baz foo -+ ./bar bar baz foo -+ ./bar bar baz foo -+ ./basic bar baz foo -+ ./baz bar baz foo -+ ./c bar baz foo -+ ./d bar baz foo -+ ./e bar baz foo -+ ./f bar baz foo -+ ./foo bar baz foo -+ ./foo bar baz foo -+ ./foo bar baz foo -+ ./g bar baz foo -+ ./h bar baz foo -+ ./i bar baz foo -+ ./j bar baz foo -+ ./k bar baz foo -+ ./l bar baz foo +foo ./a bar + baz +foo ./b bar + baz +foo ./bar bar + baz +foo ./bar bar + baz +foo ./basic bar + baz +foo ./baz bar + baz +foo ./c bar + baz +foo ./d bar + baz +foo ./e bar + baz +foo ./f bar + baz +foo ./foo bar + baz +foo ./foo bar + baz +foo ./foo bar + baz +foo ./g bar + baz +foo ./h bar + baz +foo ./i bar + baz +foo ./j bar + baz +foo ./k bar + baz +foo ./l bar + baz -- cgit v1.2.3