Skip to contentSkip to conversation

skipfile: allow regular expressions

PATCH Superseded Daniel Sangorrin 2 participants 4 messages Jan 16, 2018 – Feb 7, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 skipfile: allow regular expressions

This patch allows using regular expressions to match test cases that should be skipped when using the -S option. For example, creating a SKIPFILE with "cron.*" on it will skip all test names that start with "cron".

---
 runltp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
runltp +2 -1
index 302c4a7..1295651 100755
@@ -692,10 +692,11 @@ main()
     fi
 
     # Blacklist or skip tests if a SKIPFILE was specified with -S
+    # The SKIPFILE can contain regular expressions (e.g.: cron.*)
     if [ -n "${SKIPFILE}" ]; then
         for test_name in $(awk '{print $1}' "${SKIPFILE}"); do
             case "${test_name}" in \#*) continue;; esac
-            sed -i "/\<${test_name}\>/c\\${test_name} exit 32;" alltests
+            sed -i "s/^\(${test_name}\)\s.*/\1 exit 32;/" alltests
         done
     fi
 
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 1/1 skipfile: allow regular expressions

Hi!

Quoted 4 lines
runltp +0 -0
@@ -692,10 +692,11 @@ main()
     fi

runltp main() · line 701

Quoted 10 lines
runltp +2 -1
 
     # Blacklist or skip tests if a SKIPFILE was specified with -S
+    # The SKIPFILE can contain regular expressions (e.g.: cron.*)
     if [ -n "${SKIPFILE}" ]; then
         for test_name in $(awk '{print $1}' "${SKIPFILE}"); do
             case "${test_name}" in \#*) continue;; esac
-            sed -i "/\<${test_name}\>/c\\${test_name} exit 32;" alltests
+            sed -i "s/^\(${test_name}\)\s.*/\1 exit 32;/" alltests
         done
     fi

Looks good, but please update runltplite.sh as well.

Signature · 2 lines
Cyril Hrubis
[email protected]
#2 lore raw

PATCH v2 1/1 skipfile: allow regular expressions

Hi Cyril,

Quoted 13 lines

-----Original Message-----
From: Cyril Hrubis [mailto:[email protected]]
Sent: Tuesday, January 23, 2018 12:19 AM
To: Daniel Sangorrin
Cc: [email protected]
Subject: Re: [LTP] [PATCH v2] skipfile: allow regular expressions

Hi!

Quoted 5 lines
runltp +0 -0
@@ -692,10 +692,11 @@ main()
     fi
 
Quoted 11 lines

runltp main() · line 701

Quoted 9 lines
runltp +2 -1
     # Blacklist or skip tests if a SKIPFILE was specified with -S
+    # The SKIPFILE can contain regular expressions (e.g.: cron.*)
     if [ -n "${SKIPFILE}" ]; then
         for test_name in $(awk '{print $1}' "${SKIPFILE}"); do
             case "${test_name}" in \#*) continue;; esac
-            sed -i "/\<${test_name}\>/c\\${test_name} exit 32;" alltests
+            sed -i "s/^\(${test_name}\)\s.*/\1 exit 32;/" alltests
         done
     fi

Looks good, but please update runltplite.sh as well.

Sorry for the delay. I found that my patch had a flaw while testing it on runltplite.sh. For example, "rwtest.*" doesn't work for rwtest:
rwtest01 export LTPROOT; rwtest -N rwtest01 -c -q -i 60s -f sync ..

The reason is that "rwtest.*" matches too much. If I use "rwtest[a-zA-Z0-9]" as a regex on the skipfile then it works as expected

Example:

$ STRING="rwtest01 export LTPROOT; rwtest -N rwtest01 -c -q -i 60s -f"
$ sed "s/^\(rwtest.*\)\s.*/\1 exit 32;/" <<< $STRING
    rwtest01 export LTPROOT; rwtest -N rwtest01 -c -q -i 60s -f exit 32  (BAD!!)
$ sed "s/^\(rwtest[a-zA-Z0-9]*\)\s.*/\1 exit 32;/" <<< $STRING
rwtest01 exit 32 (GOOD!!)

I think that the skipfile entries should only care about the testname, so "rwtest.*" should actually work. I have tried modifying the sed instruction but I wasn't able to isolate the first occurrence. Should I extract the test_name (first words, except blank lines) from alltests and match them with the skipfile entries one by one in a loop?

Thanks,
Daniel

Quoted 3 lines

--
Cyril Hrubis
[email protected]

#3 lore raw

PATCH v2 1/1 skipfile: allow regular expressions

Hi!

Quoted 7 lines

Sorry for the delay. I found that my patch had a flaw while testing it on runltplite.sh. For example, "rwtest.*" doesn't work for rwtest:
rwtest01 export LTPROOT; rwtest -N rwtest01 -c -q -i 60s -f sync ..

The reason is that "rwtest.*" matches too much. If I use "rwtest[a-zA-Z0-9]" as a regex on the skipfile then it works as expected

Quoted 6 lines

Example:

$ STRING="rwtest01 export LTPROOT; rwtest -N rwtest01 -c -q -i 60s -f"
$ sed "s/^\(rwtest.*\)\s.*/\1 exit 32;/" <<< $STRING
    rwtest01 export LTPROOT; rwtest -N rwtest01 -c -q -i 60s -f exit 32  (BAD!!)
$ sed "s/^\(rwtest[a-zA-Z0-9]*\)\s.*/\1 exit 32;/" <<< $STRING
rwtest01 exit 32 (GOOD!!)

Ah looks like your first attempt ends up eating the source greadily so \1 ends up being everything to the last whitespace.

I guess that s/^\(rwtest[\S]*\).*/\1 exit 32;/ should work, since it will stop at first whitespace.

Signature · 2 lines
Cyril Hrubis
[email protected]