Hello community,

here is the log from the commit of package grep for openSUSE:Factory
checked in at Mon Oct 3 09:20:09 CEST 2011.



--------
--- openSUSE:Factory/grep/grep.changes  2011-09-23 02:01:59.000000000 +0200
+++ grep/grep.changes   2011-09-27 12:43:14.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 27 12:42:54 CEST 2011 - dmuel...@suse.de
+
+- fix testsuite to build properly against locally built grep
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  fix-testsuite.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ grep.spec ++++++
--- /var/tmp/diff_new_pack.N1mKoi/_old  2011-10-03 09:20:05.000000000 +0200
+++ /var/tmp/diff_new_pack.N1mKoi/_new  2011-10-03 09:20:05.000000000 +0200
@@ -32,6 +32,7 @@
 Release:        1
 Summary:        Print lines matching a pattern
 Source:         grep-%{version}.tar.bz2
+Patch0:         fix-testsuite.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -44,6 +45,7 @@
 %if 0%{?suse_version} < 1120
 echo 
"ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" 
>config.cache
 %endif
+%patch0
 
 %build
 %if 0%{?suse_version} < 1120

++++++ fix-testsuite.diff ++++++
--- tests/reversed-range-endpoints
+++ tests/reversed-range-endpoints
@@ -11,7 +11,7 @@
   test $? = 2 || fail=1
 
   # Remove "program_name: " prefix from actual output.
-  sed 's/^[a-z]*: //' out > k && mv k out
+  sed 's/^[^ ]*: //' out > k && mv k out
 
   compare out exp || fail=1
 done
--- tests/warn-char-classes
+++ tests/warn-char-classes
@@ -5,13 +5,15 @@
 echo f > x || framework_failure_
 echo b >> x || framework_failure_
 echo h >> x || framework_failure_
-printf 'grep: character class syntax is [[:space:]], not [:space:]\n' \
+printf 'character class syntax is [[:space:]], not [:space:]\n' \
   > exp-err || framework_failure_
 
 # basic cases
 
 grep '[:space:]' x 2> err
 test $? = 2 || fail=1
+# Remove "program_name: " prefix from actual output.
+sed 's/^[^ ]*: //' err > k && mv k err
 compare err exp-err || fail=1
 
 grep '[[:space:]]' x 2> err
continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to