shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

test: simplify rules-test.sh wrapper

Browse Source 
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.
This commit is contained in:
Martin Pitt 2015-01-20 20:50:35 +01:00
parent c09ef2e4e8
commit e8015e6e28
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/rule-syntax-check.py
View File

@ -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

4
test/rules-test.sh
View File

@ -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