From 58a4acffa45024eb43d2e04928b3aafa93a051d4 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Nov 04 2015 15:26:38 +0000 Subject: tests: disabled long-pattern-perf This test doesn't seem to be suitable for distribution buildsystem. Signed-off-by: Jaroslav Škarvada --- diff --git a/grep-2.22-disable-long-pattern-perf-test.patch b/grep-2.22-disable-long-pattern-perf-test.patch new file mode 100644 index 0000000..3d86fe8 --- /dev/null +++ b/grep-2.22-disable-long-pattern-perf-test.patch @@ -0,0 +1,12 @@ +diff --git a/tests/long-pattern-perf b/tests/long-pattern-perf +index c222c02..17557c0 100755 +--- a/tests/long-pattern-perf ++++ b/tests/long-pattern-perf +@@ -19,6 +19,7 @@ + . "${srcdir=.}/init.sh"; path_prepend_ ../src + + fail=0 ++skip_ "not suitable for distribution buildsystem, disabled by Fedora downstream" + + echo x > in || framework_failure_ + # We could use seq -s '' (avoiding the tr filter), but I diff --git a/grep-2.22-profile-test-long-pattern-perf.patch b/grep-2.22-profile-test-long-pattern-perf.patch deleted file mode 100644 index 7c304b8..0000000 --- a/grep-2.22-profile-test-long-pattern-perf.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/tests/long-pattern-perf b/tests/long-pattern-perf -index c222c02..90d9738 100755 ---- a/tests/long-pattern-perf -+++ b/tests/long-pattern-perf -@@ -30,9 +30,14 @@ seq 10000 100000 | tr -d '\012' > re-10x || framework_failure_ - base_ms=$(user_time_ 1 grep -f re in ) || fail=1 - b10x_ms=$(user_time_ 1 grep -f re-10x in) || fail=1 - -+echo "base_ms: $base_ms" -+echo "b10x_ms: $b10x_ms" -+ - # Increasing the length of the regular expression by a factor - # of 10 should cause no more than a 10x increase in duration. - # However, we'll draw the line at 20x to avoid false-positives. - expr $base_ms '<' $b10x_ms / 20 && fail=1 - -+echo "expr: `expr $b10x_ms / 20`" -+echo "expr_full: `expr $b10x_ms / 20`" - Exit $fail diff --git a/grep.spec b/grep.spec index 0473dc4..5fd6bbd 100644 --- a/grep.spec +++ b/grep.spec @@ -17,7 +17,7 @@ Source4: grepconf.sh Patch0: grep-2.22-man-fix-gs.patch # upstream ticket 39445 Patch1: grep-2.22-help-align.patch -Patch2: grep-2.22-profile-test-long-pattern-perf.patch +Patch2: grep-2.22-disable-long-pattern-perf-test.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -37,7 +37,7 @@ GNU grep is needed by many scripts, so it shall be installed on every system. %setup -q %patch0 -p1 -b .man-fix-gs %patch1 -p1 -b .help-align -%patch2 -p1 -b .profile-test-long-pattern-perf +%patch2 -p1 -b .disable-long-pattern-perf-test chmod 755 tests/kwset-abuse