From a402404fb23195839a9e008dbbe5edb5349c05b0 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 5 Feb 2009 12:40:15 +0100
Subject: [PATCH] test: add test for empty and non-existent ATTR

---
 .../0:0:0:0/block/sda/test_empty_file         |  0
 test/udev-test.pl                             | 27 +++++++++++++++++++
 udev/udevadm-settle.c                         |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 test/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/test_empty_file

diff --git a/test/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/test_empty_file b/test/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/test_empty_file
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/udev-test.pl b/test/udev-test.pl
index 1b81eb8d7..4f61ce3e5 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -480,6 +480,33 @@ EOF
 		rules		=> <<EOF
 KERNEL=="console", NAME="TTY"
 ATTRS{dev}=="5:1", NAME="foo"
+EOF
+	},
+	{
+		desc		=> "ATTR (empty file)",
+		subsys		=> "tty",
+		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+		exp_name	=> "empty" ,
+		rules		=> <<EOF
+KERNEL=="sda", ATTR{test_empty_file}=="?*", NAME:="something"
+KERNEL=="sda", ATTR{test_empty_file}!="", NAME:="not-empty"
+KERNEL=="sda", ATTR{test_empty_file}=="", NAME:="empty"
+KERNEL=="sda", ATTR{test_empty_file}!="?*", NAME:="not-something"
+KERNEL=="sda", NAME="wrong"
+EOF
+	},
+	{
+		desc		=> "ATTR (non-existent file)",
+		subsys		=> "tty",
+		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+		exp_name	=> "non-existent" ,
+		rules		=> <<EOF
+KERNEL=="sda", ATTR{nofile}=="?*", NAME:="something"
+KERNEL=="sda", ATTR{nofile}!="", NAME:="not-empty"
+KERNEL=="sda", ATTR{nofile}=="", NAME:="empty"
+KERNEL=="sda", ATTR{nofile}!="?*", NAME:="not-something"
+KERNEL=="sda", TEST!="nofile", NAME:="non-existent"
+KERNEL=="sda", NAME="wrong"
 EOF
 	},
 	{
diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 8a765f61c..867bbed13 100644
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -84,6 +84,8 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 			break;
 		usleep(1000 * 1000 / LOOP_PER_SECOND);
 	}
+
+	/* if we reached the timeout, print the list of remaining events */
 	if (loop <= 0) {
 		struct udev_list_entry *list_entry;
 
-- 
2.30.2