]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-execute: update test for SystemCallErrorNumber= 7178/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 11 Nov 2017 12:41:05 +0000 (21:41 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 11 Nov 2017 12:54:29 +0000 (21:54 +0900)
src/test/test-execute.c
test/meson.build
test/test-execute/exec-systemcallerrornumber-name.service [moved from test/test-execute/exec-systemcallerrornumber.service with 57% similarity]
test/test-execute/exec-systemcallerrornumber-number.service [new file with mode: 0644]

index c86e074e9d438782bb95cba57e7fa6399346820c..998724189f71551da04890afb6bcf99514c3576c 100644 (file)
@@ -270,8 +270,10 @@ static void test_exec_systemcallfilter(Manager *m) {
 
 static void test_exec_systemcallerrornumber(Manager *m) {
 #if HAVE_SECCOMP
-        if (is_seccomp_available())
-                test(m, "exec-systemcallerrornumber.service", 1, CLD_EXITED);
+        if (!is_seccomp_available())
+                return;
+        test(m, "exec-systemcallerrornumber-name.service", errno_from_name("EACCES"), CLD_EXITED);
+        test(m, "exec-systemcallerrornumber-number.service", 255, CLD_EXITED);
 #endif
 }
 
index 941878dea4ff2d0251d7410ec27cff77a4feaf2c..69d6c758b0adb0528532cc363868a316cf262544 100644 (file)
@@ -100,7 +100,8 @@ test_data_files = '''
         test-execute/exec-supplementarygroups-single-group-user.service
         test-execute/exec-supplementarygroups-single-group.service
         test-execute/exec-supplementarygroups.service
-        test-execute/exec-systemcallerrornumber.service
+        test-execute/exec-systemcallerrornumber-name.service
+        test-execute/exec-systemcallerrornumber-number.service
         test-execute/exec-systemcallfilter-failing.service
         test-execute/exec-systemcallfilter-failing2.service
         test-execute/exec-systemcallfilter-not-failing.service
similarity index 57%
rename from test/test-execute/exec-systemcallerrornumber.service
rename to test/test-execute/exec-systemcallerrornumber-name.service
index ff7da3c1a49c20156693dbc7c147ad48106c9e94..229b862794db7dbdfe083b74ef5dfd781465663d 100644 (file)
@@ -2,7 +2,7 @@
 Description=Test for SystemCallErrorNumber
 
 [Service]
-ExecStart=/bin/sh -x -c 'uname -a'
+ExecStart=/bin/python3 -c 'import os\ntry: os.uname()\nexcept Exception as e: exit(e.errno)'
 Type=oneshot
 SystemCallFilter=~uname
 SystemCallErrorNumber=EACCES
diff --git a/test/test-execute/exec-systemcallerrornumber-number.service b/test/test-execute/exec-systemcallerrornumber-number.service
new file mode 100644 (file)
index 0000000..2e13f08
--- /dev/null
@@ -0,0 +1,8 @@
+[Unit]
+Description=Test for SystemCallErrorNumber
+
+[Service]
+ExecStart=/bin/python3 -c 'import os\ntry: os.uname()\nexcept Exception as e: exit(e.errno)'
+Type=oneshot
+SystemCallFilter=~uname
+SystemCallErrorNumber=255