From 3a8cf03d9478013efdc87bb099f3e37d58231cfb Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Mon, 25 Aug 2014 20:53:57 -0700 Subject: [PATCH] test: replace use of pcre grep with awk Unfortunately, grep -P is not ubiquitous, so use awk with two regexps to simulate the negative forward lookup in the grep -P expression. Using awk doesn't really make it too unreadable, as using boolean operators such as && and || might actually make it more intuitive than the extended regexp. Tested: - sudo make -C test zdtm_ns - sudo make -C test zdtm_nons Signed-off-by: Filipe Brandenburger Acked-by: Andrew Vagin Signed-off-by: Pavel Emelyanov --- test/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/Makefile b/test/Makefile index ed8c34bf8..f6c7b7ba7 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,4 @@ TST = $(shell ./zdtm.sh -l) -EXP = '^ns/(?!.*(tty|pty))' ZDTM_ARGS ?= -C @@ -25,8 +24,8 @@ fault-injection: .FORCE $(MAKE) -C fault-injection .PHONY: fault-injection -zdtm_ns: $(shell echo "$(TST)" | tr ' ' '\n' | grep -P $(EXP)) -zdtm_nons: $(shell echo "$(TST)" | tr ' ' '\n' | grep -vP $(EXP)) +zdtm_ns: $(shell echo "$(TST)" | tr ' ' '\n' | awk '/^ns\// && !/tty|pty/ {print}') +zdtm_nons: $(shell echo "$(TST)" | tr ' ' '\n' | awk '!/^ns\// || /tty|pty/ {print}') override CFLAGS += -D_GNU_SOURCE zdtm_ct: zdtm_ct.c