meson: re-attach rule-syntax-check.py test

 39/248 rule-syntax-check                       OK     0.07 s

--- command ---
/home/zbyszek/src/systemd-work/test/rule-syntax-check.py \
    /home/zbyszek/src/systemd-work/build/../rules/60-block.rules \
    /home/zbyszek/src/systemd-work/build/../rules/60-cdrom_id.rules \
    /home/zbyszek/src/systemd-work/build/../rules/60-drm.rules \
    /home/zbyszek/src/systemd-work/build/../rules/60-evdev.rules \
    /home/zbyszek/src/systemd-work/build/../rules/60-input-id.rules \
    /home/zbyszek/src/systemd-work/build/../rules/60-persistent-alsa.rules \
    /home/zbyszek/src/systemd-work/build/../rules/60-persistent-input.rules \
    /home/zbyszek/src/systemd-work/build/../rules/60-persistent-storage.rules \
    /home/zbyszek/src/systemd-work/build/../rules/60-persistent-storage-tape.rules \
    /home/zbyszek/src/systemd-work/build/../rules/60-persistent-v4l.rules \
    /home/zbyszek/src/systemd-work/build/../rules/60-sensor.rules \
    /home/zbyszek/src/systemd-work/build/../rules/60-serial.rules \
    /home/zbyszek/src/systemd-work/build/../rules/70-joystick.rules \
    /home/zbyszek/src/systemd-work/build/../rules/70-mouse.rules \
    /home/zbyszek/src/systemd-work/build/../rules/70-touchpad.rules \
    /home/zbyszek/src/systemd-work/build/../rules/75-net-description.rules \
    /home/zbyszek/src/systemd-work/build/../rules/75-probe_mtd.rules \
    /home/zbyszek/src/systemd-work/build/../rules/78-sound-card.rules \
    /home/zbyszek/src/systemd-work/build/../rules/80-drivers.rules \
    /home/zbyszek/src/systemd-work/build/../rules/80-net-setup-link.rules \
    /home/zbyszek/src/systemd-work/build/rules/50-udev-default.rules \
    /home/zbyszek/src/systemd-work/build/rules/64-btrfs.rules \
    /home/zbyszek/src/systemd-work/build/rules/99-systemd.rules
--- stdout ---
...
-------

It got dropped by mistake in 72cdb3e783174dcf9223a49f03e3b0e2ca95ddb8.

diff --git a/meson.build b/meson.build
index 7e997b195ace33a9292f74f55da252ef72abeba6..6317847663db482fce9322f69da92d4ee1e3b61d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1218,6 +1218,7 @@ subdir('src/sulogin-shell')
 subdir('src/boot/efi')
 
 subdir('src/test')
+subdir('rules')
 subdir('test')
 
 ############################################################
@@ -2345,7 +2346,6 @@ subdir('units')
 subdir('sysctl.d')
 subdir('sysusers.d')
 subdir('tmpfiles.d')
-subdir('rules')
 subdir('hwdb')
 subdir('network')
 subdir('man')

diff --git a/rules/meson.build b/rules/meson.build
index 56a270712a4874441c3f2c6d0c0677b82905ba66..e253b9f5916dd2c245466961e854a5d7f312bdbb 100644 (file)
--- a/rules/meson.build
+++ b/rules/meson.build
@@ -41,6 +41,8 @@ rules = files('''
 install_data(rules,
              install_dir : udevrulesdir)
 
+all_rules = rules
+
 rules_in = '''
         50-udev-default.rules
         64-btrfs.rules
@@ -54,4 +56,5 @@ foreach file : rules_in
                 configuration : substs)
         install_data(gen,
                      install_dir : udevrulesdir)
+        all_rules += gen
 endforeach

diff --git a/test/meson.build b/test/meson.build
index 40605b385ffd34c94c0e22ddb148ca98afab4dc8..28b5fcdbca62d9b88132065ae993384bbbae2483 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -188,6 +188,13 @@ endif
 
 ############################################################
 
+rule_syntax_check_py = find_program('rule-syntax-check.py')
+test('rule-syntax-check',
+     rule_syntax_check_py,
+     args : all_rules)
+
+############################################################
+
 if conf.get('HAVE_SYSV_COMPAT') == 1
         sysv_generator_test_py = find_program('sysv-generator-test.py')
         test('sysv-generator-test',

diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py
index 7c69c489cb06ed45118ca2d1a7311ea38e8718c2..e053b027ca1ef005a00eb5fa060cfb9fbbda5766 100755 (executable)
--- a/test/rule-syntax-check.py
+++ b/test/rule-syntax-check.py
@@ -24,17 +24,9 @@ import sys
 import os
 from glob import glob
 
-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):
-        print('No rules files given, and {} does not exist, aborting'.format(rules_dir), file=sys.stderr)
-        sys.exit(2)
-    rules_files = glob(os.path.join(rules_dir, '*.rules'))
+rules_files = sys.argv[1:]
+if not rules_files:
+    sys.exit('Specify files to test as arguments')
 
 no_args_tests = re.compile(r'(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|DRIVERS?|TAG|RESULT|TEST)\s*(?:=|!)=\s*"([^"]*)"$')
 args_tests = re.compile(r'(ATTRS?|ENV|TEST){([a-zA-Z0-9/_.*%-]+)}\s*(?:=|!)=\s*"([^"]*)"$')