summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2015-01-20 20:50:35 +0100
committerMartin Pitt <martin.pitt@ubuntu.com>2015-01-20 20:52:25 +0100
commite8015e6e28fe7d287fc1d5d8bfd82ca65c51326c (patch)
tree820b84edb419f34a1b6139d64bd79fb8daf75db2 /test
parentc09ef2e4e8331ddc7ee063d295c322a0939ea851 (diff)
test: simplify rules-test.sh wrapper
Drop globbing of rules/*.rules in the rules-test.sh wrapper and move that logic into the actual test rule-syntax-check.py. This can still be called with individual rules files, but when being called without arguments it will now process all top_builddir/rules/*.rules. Preparation for dropping the shell wrappers altogether.
Diffstat (limited to 'test')
-rw-r--r--test/rule-syntax-check.py18
-rwxr-xr-xtest/rules-test.sh4
2 files changed, 15 insertions, 7 deletions
diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py
index 8c0180bd3c..80bbe65bea 100644
--- a/test/rule-syntax-check.py
+++ b/test/rule-syntax-check.py
@@ -18,10 +18,20 @@
import re
import sys
+import os
+from glob import glob
-if len(sys.argv) < 2:
- sys.stderr.write('Usage: %s <rules file> [...]\n' % sys.argv[0])
- sys.exit(2)
+if len(sys.argv) > 1:
+ # explicit rule file list
+ rules_files = sys.argv[1:]
+else:
+ # take them from the build dir
+ root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+ rules_dir = os.path.join(os.environ.get('top_srcdir', root_dir), 'rules')
+ if not os.path.isdir(rules_dir):
+ sys.stderr.write('No rules files given, and %s does not exist, aborting' % rules_dir)
+ sys.exit(2)
+ rules_files = glob(os.path.join(rules_dir, '*.rules'))
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*"([^"]*)"$')
@@ -30,7 +40,7 @@ args_assign = re.compile('(ATTR|ENV|IMPORT|RUN){([a-zA-Z0-9/_.*%-]+)}\s*(=|\+=)\
result = 0
buffer = ''
-for path in sys.argv[1:]:
+for path in rules_files:
lineno = 0
for line in open(path):
lineno += 1
diff --git a/test/rules-test.sh b/test/rules-test.sh
index 219575360e..50b83a3e91 100755
--- a/test/rules-test.sh
+++ b/test/rules-test.sh
@@ -17,12 +17,10 @@
# You should have received a copy of the GNU Lesser General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-[ -n "$srcdir" ] || srcdir=`dirname $0`/..
-
# skip if we don't have python
type ${PYTHON:-python} >/dev/null 2>&1 || {
echo "$0: No $PYTHON installed, skipping udev rule syntax check"
exit 0
}
-$PYTHON $srcdir/test/rule-syntax-check.py `find $srcdir/rules -name '*.rules'`
+$PYTHON $srcdir/test/rule-syntax-check.py