diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2019-02-07 16:12:48 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2019-02-07 16:12:48 +0000 |
| commit | 3192561de7c8f40a7f9dd5ad7740fbd9fa09ce8c (patch) | |
| tree | c3e2071426d051b19fbbf01f348f4fe4f6e9fb81 | |
| parent | fc4503b81314924b7abaf291ca41fc4027786491 (diff) | |
| download | kernel-tla-3192561de7c8f40a7f9dd5ad7740fbd9fa09ce8c.tar.gz | |
Fix check.sh to deal with single-line 'vars' definition
The sed script replacing vars with proc_vars incorrectly handled
single-line vars definition.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| -rwxr-xr-x | check.sh | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -20,6 +20,9 @@ if grep -q -e "^\s*ProcessEnabled(self)\s*==" $SPEC.tla; then fi # Split << pc, stack >> out of the default vars and generate proc_vars -sed -i -e "/^vars\s*==/,/>>/{s/\<vars\>/proc_vars/;s/\<pc,\s*\|\<stack,\s*//g;s/>>/>>\n\nvars == << proc_vars, pc, stack >>/}" $SPEC.tla +# Match single line and multiline patterns +SUBST="{s/\<vars\>/proc_vars/;s/\<pc,\s*\|\<stack,\s*//g;s/>>/>>\n vars == << proc_vars, pc, stack >>/}" +sed -i -e "/^vars\s*==.*>>$/$SUBST" $SPEC.tla +sed -i -e "/^vars\s*==[^>]*/,/>>$/$SUBST" $SPEC.tla tlc -workers $(nproc) $@ $SPEC.tla | tee -a $SPEC.log |