From 06dbbb899cf6b4a8283156f3d1b471e506ed37dd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 28 Jan 2016 10:06:40 +0100 Subject: [PATCH] tests: fix tests for nm_utils_kill_child() by using "bash" Seems that "dash" has issues with trap EXIT. This causes test failures on systems where the default shell is not "bash". [thaller@redhat.com: patch extracted from BZ and modified to use bash everywhere] https://bugzilla.gnome.org/show_bug.cgi?id=761146 --- src/tests/test-general-with-expect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c index 91f3f33619..0796f7caac 100644 --- a/src/tests/test-general-with-expect.c +++ b/src/tests/test-general-with-expect.c @@ -225,33 +225,33 @@ test_nm_utils_kill_child (void) int err; GLogLevelFlags fatal_mask; char *argv_watchdog[] = { - "sh", + "bash", "-c", "sleep 4; " "kill -KILL 0; #watchdog for #" TEST_TOKEN, NULL, }; char *argv1[] = { - "sh", + "bash", "-c", "trap \"sleep 0.3; exit 10\" EXIT; " "sleep 100000; exit $? #" TEST_TOKEN, NULL, }; char *argv2[] = { - "sh", + "bash", "-c", "exit 47; #" TEST_TOKEN, NULL, }; char *argv3[] = { - "sh", + "bash", "-c", "trap \"exit 47\" TERM; while true; do :; done; #" TEST_TOKEN, NULL, }; char *argv4[] = { - "sh", + "bash", "-c", "trap \"while true; do :; done\" TERM; while true; do :; done; #" TEST_TOKEN, NULL,