From: Karel Zak <kzak@redhat.com>
Date: Fri, 30 Aug 2019 18:35:55 +0000 (+0200)
Subject: tests: (getopt) remove unwanted paths from error output
X-Git-Tag: v2.35-rc1~249
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Futil-linux.git;a=commitdiff_plain;h=e3803ff86961cca74d424225c99216f4ba797f2a

tests: (getopt) remove unwanted paths from error output

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

diff --git a/tests/expected/getopt/options-invalid_getopt_option.err b/tests/expected/getopt/options-invalid_getopt_option.err
index 48ce3c5972..1eb882199a 100644
--- a/tests/expected/getopt/options-invalid_getopt_option.err
+++ b/tests/expected/getopt/options-invalid_getopt_option.err
@@ -1,2 +1,2 @@
-/home/projects/util-linux/util-linux/getopt: invalid option -- 'b'
+getopt: invalid option -- 'b'
 Try 'getopt --help' for more information.
diff --git a/tests/expected/getopt/options-long_option_ambiguous_1.err b/tests/expected/getopt/options-long_option_ambiguous_1.err
index 7739c76990..1422799e80 100644
--- a/tests/expected/getopt/options-long_option_ambiguous_1.err
+++ b/tests/expected/getopt/options-long_option_ambiguous_1.err
@@ -1 +1 @@
-/home/projects/util-linux/util-linux/getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2'
+getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2'
diff --git a/tests/expected/getopt/options-quiet_output_option_long.err b/tests/expected/getopt/options-quiet_output_option_long.err
index 58884308d4..4fd8b0b738 100644
--- a/tests/expected/getopt/options-quiet_output_option_long.err
+++ b/tests/expected/getopt/options-quiet_output_option_long.err
@@ -1,4 +1,4 @@
-/home/projects/util-linux/util-linux/getopt: invalid option -- 'c'
-/home/projects/util-linux/util-linux/getopt: unrecognized option '--unknown'
-/home/projects/util-linux/util-linux/getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2'
-/home/projects/util-linux/util-linux/getopt: option requires an argument -- 'b'
+getopt: invalid option -- 'c'
+getopt: unrecognized option '--unknown'
+getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2'
+getopt: option requires an argument -- 'b'
diff --git a/tests/expected/getopt/options-quiet_output_option_short.err b/tests/expected/getopt/options-quiet_output_option_short.err
index 58884308d4..4fd8b0b738 100644
--- a/tests/expected/getopt/options-quiet_output_option_short.err
+++ b/tests/expected/getopt/options-quiet_output_option_short.err
@@ -1,4 +1,4 @@
-/home/projects/util-linux/util-linux/getopt: invalid option -- 'c'
-/home/projects/util-linux/util-linux/getopt: unrecognized option '--unknown'
-/home/projects/util-linux/util-linux/getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2'
-/home/projects/util-linux/util-linux/getopt: option requires an argument -- 'b'
+getopt: invalid option -- 'c'
+getopt: unrecognized option '--unknown'
+getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2'
+getopt: option requires an argument -- 'b'
diff --git a/tests/expected/getopt/options-unknown_options.err b/tests/expected/getopt/options-unknown_options.err
index 1c0518bbd2..f8f67fb19e 100644
--- a/tests/expected/getopt/options-unknown_options.err
+++ b/tests/expected/getopt/options-unknown_options.err
@@ -1,2 +1,2 @@
-/home/projects/util-linux/util-linux/getopt: invalid option -- 'b'
-/home/projects/util-linux/util-linux/getopt: unrecognized option '--whatever'
+getopt: invalid option -- 'b'
+getopt: unrecognized option '--whatever'
diff --git a/tests/ts/getopt/options b/tests/ts/getopt/options
index 7534d7a758..eedcbbc52a 100755
--- a/tests/ts/getopt/options
+++ b/tests/ts/getopt/options
@@ -53,7 +53,7 @@ ts_finalize_subtest
 ts_init_subtest invalid_getopt_option
 $TS_CMD_GETOPT -b >> $TS_OUTPUT 2>> $TS_ERRLOG
 echo "exit value: $?" >> $TS_OUTPUT
-sed -i '1,1s/.*\///' $TS_OUTPUT
+sed -i '1,1s/.*\///' $TS_OUTPUT $TS_ERRLOG
 gnu_getopt_clean
 ts_finalize_subtest
 
@@ -84,8 +84,8 @@ ts_finalize_subtest
 ts_init_subtest long_option_ambiguous_1
 $TS_CMD_GETOPT -o a -l long1,long2 -- --long >> $TS_OUTPUT 2>> $TS_ERRLOG
 echo "exit value: $?" >> $TS_OUTPUT
-sed -i -e '1,1s/.*\///' -e "1s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT
-sed -i -e "1s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT
+sed -i -e '1,1s/.*\///' -e "1s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT $TS_ERRLOG
+sed -i -e "1s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT $TS_ERRLOG
 gnu_getopt_clean
 ts_finalize_subtest
 
@@ -122,16 +122,16 @@ ts_finalize_subtest
 ts_init_subtest quiet_output_option_long
 $TS_CMD_GETOPT --quiet-output -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>> $TS_ERRLOG
 echo "exit value: $?" >> $TS_OUTPUT
-sed -i -e '1,4s/.*\///' -e "3s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT
-sed -i -e "3s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT
+sed -i -e '1,4s/.*\///' -e "3s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT $TS_ERRLOG
+sed -i -e "3s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT $TS_ERRLOG
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest quiet_output_option_short
 $TS_CMD_GETOPT -Q -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>> $TS_ERRLOG
 echo "exit value: $?" >> $TS_OUTPUT
-sed -i -e '1,4s/.*\///' -e "3s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT
-sed -i "3s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT
+sed -i -e '1,4s/.*\///' -e "3s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT $TS_ERRLOG
+sed -i "3s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT $TS_ERRLOG
 gnu_getopt_clean
 ts_finalize_subtest
 
@@ -150,7 +150,7 @@ ts_finalize_subtest
 ts_init_subtest unknown_options
 $TS_CMD_GETOPT -o a -l long -- -b --long --whatever -a >> $TS_OUTPUT 2>> $TS_ERRLOG
 echo "exit value: $?" >> $TS_OUTPUT
-sed -i '1,2s/.*\///' $TS_OUTPUT
+sed -i '1,2s/.*\///' $TS_OUTPUT $TS_ERRLOG
 gnu_getopt_clean
 ts_finalize_subtest
 
@@ -195,7 +195,7 @@ $TS_CMD_GETOPT >> $TS_OUTPUT 2>> $TS_ERRLOG
 echo "exit value: $?" >> $TS_OUTPUT
 GETOPT_COMPATIBLE='' $TS_CMD_GETOPT >> $TS_OUTPUT 2>> $TS_ERRLOG
 echo "exit value: $?" >> $TS_OUTPUT
-sed -i '1,1s/.*\///' $TS_OUTPUT
+sed -i '1,1s/.*\///' $TS_OUTPUT $TS_ERRLOG
 ts_finalize_subtest
 
 ts_init_subtest sh
@@ -211,7 +211,7 @@ ts_finalize_subtest
 ts_init_subtest no-arguments
 $TS_CMD_GETOPT >> $TS_OUTPUT 2>> $TS_ERRLOG
 echo "exit value: $?" >> $TS_OUTPUT
-sed -i '1,1s/.*\///' $TS_OUTPUT
+sed -i '1,1s/.*\///' $TS_OUTPUT $TS_ERRLOG
 ts_finalize_subtest
 
 ts_init_subtest posix_correctly