forked from rpms/glibc
74 lines
2.8 KiB
Diff
74 lines
2.8 KiB
Diff
|
commit 4eda036f5b897fa8bc20ddd2099b5a6ed4239dc9
|
||
|
|
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
||
|
|
Date: Tue Mar 24 15:48:34 2020 -0300
|
||
|
|
|
||
|
|
stdlib: Move tst-system to tests-container
|
||
|
|
|
||
|
|
Fix some issues with different shell and error messages.
|
||
|
|
|
||
|
|
Checked on x86_64-linux-gnu and i686-linux-gnu.
|
||
|
|
|
||
|
|
diff --git a/stdlib/Makefile b/stdlib/Makefile
|
||
|
|
index 01194bbf7cc96851..9d0edcf6a7749b28 100644
|
||
|
|
--- a/stdlib/Makefile
|
||
|
|
+++ b/stdlib/Makefile
|
||
|
|
@@ -70,7 +70,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
|
||
|
|
test-canon test-canon2 tst-strtoll tst-environ \
|
||
|
|
tst-xpg-basename tst-random tst-random2 tst-bsearch \
|
||
|
|
tst-limits tst-rand48 bug-strtod tst-setcontext \
|
||
|
|
- tst-setcontext2 test-a64l tst-qsort tst-system testmb2 \
|
||
|
|
+ tst-setcontext2 test-a64l tst-qsort testmb2 \
|
||
|
|
bug-strtod2 tst-atof1 tst-atof2 tst-strtod2 \
|
||
|
|
tst-rand48-2 tst-makecontext tst-strtod5 \
|
||
|
|
tst-qsort2 tst-makecontext2 tst-strtod6 tst-unsetenv1 \
|
||
|
|
@@ -92,6 +92,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
|
||
|
|
tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \
|
||
|
|
tst-tls-atexit tst-tls-atexit-nodelete
|
||
|
|
tests-static := tst-secure-getenv
|
||
|
|
+tests-container := tst-system
|
||
|
|
|
||
|
|
ifeq ($(build-hardcoded-path-in-tests),yes)
|
||
|
|
tests += tst-empty-env
|
||
|
|
diff --git a/stdlib/tst-system.c b/stdlib/tst-system.c
|
||
|
|
index b61bd347df7ec46a..194e09828dd5c206 100644
|
||
|
|
--- a/stdlib/tst-system.c
|
||
|
|
+++ b/stdlib/tst-system.c
|
||
|
|
@@ -88,7 +88,8 @@ do_test (void)
|
||
|
|
});
|
||
|
|
support_capture_subprocess_check (&result, "system", 0, sc_allow_stderr);
|
||
|
|
|
||
|
|
- char *returnerr = xasprintf ("%s: 1: %s: not found\n",
|
||
|
|
+ char *returnerr = xasprintf ("%s: execing %s failed: "
|
||
|
|
+ "No such file or directory",
|
||
|
|
basename(_PATH_BSHELL), cmd);
|
||
|
|
TEST_COMPARE_STRING (result.err.buffer, returnerr);
|
||
|
|
free (returnerr);
|
||
|
|
@@ -106,7 +107,8 @@ do_test (void)
|
||
|
|
});
|
||
|
|
support_capture_subprocess_check (&result, "system", 0, sc_allow_stderr);
|
||
|
|
|
||
|
|
- char *returnerr = xasprintf ("%s: 1: %s: File name too long\n",
|
||
|
|
+ char *returnerr = xasprintf ("%s: execing %s failed: "
|
||
|
|
+ "File name too long",
|
||
|
|
basename(_PATH_BSHELL), cmd);
|
||
|
|
TEST_COMPARE_STRING (result.err.buffer, returnerr);
|
||
|
|
free (returnerr);
|
||
|
|
@@ -116,7 +118,7 @@ do_test (void)
|
||
|
|
struct support_capture_subprocess result;
|
||
|
|
result = support_capture_subprocess (call_system,
|
||
|
|
&(struct args) {
|
||
|
|
- "kill -USR1 $$", 0, SIGUSR1
|
||
|
|
+ "kill $$", 0, SIGTERM
|
||
|
|
});
|
||
|
|
support_capture_subprocess_check (&result, "system", 0, sc_allow_none);
|
||
|
|
}
|
||
|
|
@@ -136,7 +138,7 @@ do_test (void)
|
||
|
|
support_capture_subprocess_check (&result, "system", 0, sc_allow_none);
|
||
|
|
}
|
||
|
|
|
||
|
|
- TEST_COMPARE (system (":"), 0);
|
||
|
|
+ TEST_COMPARE (system (""), 0);
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|