chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] add sysfs info walk to udevinfo
[elogind.git]
/
test
/
udev-test.pl
diff --git
a/test/udev-test.pl
b/test/udev-test.pl
index 2b9fa8a2380433e42a1f70f88a9c11cf3384ea89..2ba63fe83fe61f5f0271c636cddba878e73b4285 100644
(file)
--- a/
test/udev-test.pl
+++ b/
test/udev-test.pl
@@
-30,7
+30,7
@@
my $PWD = $ENV{PWD};
my $sysfs = "sys/";
my $udev_bin = "../udev";
my $udev_root = "udev-root/"; # !!! directory will be removed !!!
my $sysfs = "sys/";
my $udev_bin = "../udev";
my $udev_root = "udev-root/"; # !!! directory will be removed !!!
-my $udev_db = ".udev
.t
db";
+my $udev_db = ".udevdb";
my $perm = "udev.permissions";
my $main_conf = "udev-test.conf";
my $conf_tmp = "udev-test.rules";
my $perm = "udev.permissions";
my $main_conf = "udev-test.conf";
my $conf_tmp = "udev-test.rules";
@@
-550,11
+550,11
@@
KERNEL="tty2", NAME="tty2"
EOF
},
{
EOF
},
{
- desc => "permissions tty3:::",
+ desc => "permissions tty3:::
(default mode applied)
",
subsys => "tty",
devpath => "/class/tty/tty3",
exp_name => "tty3",
subsys => "tty",
devpath => "/class/tty/tty3",
exp_name => "tty3",
- exp_perms => "0:0:0",
+ exp_perms => "0:0:
60
0",
conf => <<EOF
KERNEL="tty3", NAME="tty3"
EOF
conf => <<EOF
KERNEL="tty3", NAME="tty3"
EOF
@@
-1268,13
+1268,20
@@
sub run_test {
}
if (defined($config->{option}) && $config->{option} eq "clear") {
}
if (defined($config->{option}) && $config->{option} eq "clear") {
-
unlink($udev_db
);
+
system("rm -rf $udev_db"
);
system("rm -rf $udev_root");
mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
}
}
system("rm -rf $udev_root");
mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
}
}
+# only run if we have root permissions
+# due to mknod restrictions
+if (!($<==0)) {
+ print "Must have root permissions to run properly.\n";
+ exit;
+}
+
# prepare
system("rm -rf $udev_root");
mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
# prepare
system("rm -rf $udev_root");
mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
@@
-1312,7
+1319,7
@@
if ($ARGV[0]) {
print "$error errors occured\n\n";
# cleanup
print "$error errors occured\n\n";
# cleanup
-
unlink($udev_db
);
+
system("rm -rf $udev_db"
);
system("rm -rf $udev_root");
unlink($conf_tmp);
unlink($main_conf);
system("rm -rf $udev_root");
unlink($conf_tmp);
unlink($main_conf);