summaryrefslogtreecommitdiff
path: root/src/udev/test
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-04-09 16:37:54 +0200
committerKay Sievers <kay@vrfy.org>2012-04-09 19:25:41 +0200
commit83cd6b754b270091840456a2c8a66dae19f5a7dc (patch)
treec7088359f9927196a9e64b5b1bfb100733725f47 /src/udev/test
parentf1ff47be175bdcb8ed8512393fee9f9615501e24 (diff)
udev: convert 'uaccess' to a builtin
Diffstat (limited to 'src/udev/test')
-rwxr-xr-xsrc/udev/test/rule-syntax-check.py2
-rwxr-xr-xsrc/udev/test/udev-test.pl6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/udev/test/rule-syntax-check.py b/src/udev/test/rule-syntax-check.py
index ff1b63d075..4fa3042d4f 100755
--- a/src/udev/test/rule-syntax-check.py
+++ b/src/udev/test/rule-syntax-check.py
@@ -28,7 +28,7 @@ if len(sys.argv) < 2:
no_args_tests = re.compile('(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|DRIVERS?|TAG|RESULT|TEST)\s*(?:=|!)=\s*"([^"]*)"$')
args_tests = re.compile('(ATTRS?|ENV|TEST){([a-zA-Z0-9/_.*%-]+)}\s*(?:=|!)=\s*"([^"]*)"$')
no_args_assign = re.compile('(NAME|SYMLINK|OWNER|GROUP|MODE|TAG|PROGRAM|RUN|LABEL|GOTO|WAIT_FOR|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*"([^"]*)"$')
-args_assign = re.compile('(ATTR|ENV|IMPORT){([a-zA-Z0-9/_.*%-]+)}\s*=\s*"([^"]*)"$')
+args_assign = re.compile('(ATTR|ENV|IMPORT|RUN){([a-zA-Z0-9/_.*%-]+)}\s*=\s*"([^"]*)"$')
result = 0
buffer = ''
diff --git a/src/udev/test/udev-test.pl b/src/udev/test/udev-test.pl
index 0b379b0d9a..e2bfae32bf 100755
--- a/src/udev/test/udev-test.pl
+++ b/src/udev/test/udev-test.pl
@@ -21,8 +21,8 @@ use warnings;
use strict;
my $PWD = $ENV{PWD};
-my $sysfs = "test/sys";
-my $udev_bin = "./test-udev";
+my $sysfs = "src/udev/test/sys";
+my $udev_bin = ".libs/test-udev";
my $valgrind = 0;
my $udev_bin_valgrind = "valgrind --tool=memcheck --leak-check=yes --quiet $udev_bin";
my $udev_root = "udev-root";
@@ -1347,7 +1347,7 @@ sub udev {
if ($valgrind > 0) {
system("$udev_bin_valgrind $action $devpath");
} else {
- system("$udev_bin $action $devpath");
+ system("$udev_bin", "$action", "$devpath");
}
}