7e53383774
Updates to all hs-* ports related to meta/haskell-platform will follow soon. Other hs-* ports will be fixed during the next days.
34 lines
1.6 KiB
Plaintext
34 lines
1.6 KiB
Plaintext
$OpenBSD: patch-testsuite_driver_testlib_py,v 1.7 2015/09/19 07:42:57 kili Exp $
|
|
--- testsuite/driver/testlib.py.orig Tue Jul 21 15:52:50 2015
|
|
+++ testsuite/driver/testlib.py Sun Aug 9 17:35:53 2015
|
|
@@ -1634,6 +1634,13 @@ def compare_outputs( kind, normaliser, expected_file,
|
|
actual_raw = read_no_crs(actual_file)
|
|
actual_str = normaliser(actual_raw)
|
|
|
|
+ # Strip OpenBSDs linker warnings about strcpy(3) & friends.
|
|
+ if config.os == 'openbsd':
|
|
+ actual_str = re.sub('.*: In function .*:\n+(.*:[0-9]+:[0-9]+:\n)?:? *warning: .* is .* misused, please use .*\n',
|
|
+ '', actual_str)
|
|
+ actual_str = re.sub('.*/libgmp\.so\.[0-9]*\.[0-9]*: warning: .* is .* misused, please use .*\n',
|
|
+ '', actual_str)
|
|
+
|
|
if expected_str == actual_str:
|
|
return 1
|
|
else:
|
|
@@ -1657,13 +1664,13 @@ def compare_outputs( kind, normaliser, expected_file,
|
|
# This does mean that the diff might contain changes that
|
|
# would be normalised away.
|
|
if (config.verbose >= 1):
|
|
- r = os.system( 'diff -uw ' + expected_file_for_diff + \
|
|
+ r = os.system( 'diff -auw ' + expected_file_for_diff + \
|
|
' ' + actual_file )
|
|
|
|
# If for some reason there were no non-whitespace differences,
|
|
# then do a full diff
|
|
if r == 0:
|
|
- r = os.system( 'diff -u ' + expected_file_for_diff + \
|
|
+ r = os.system( 'diff -au ' + expected_file_for_diff + \
|
|
' ' + actual_file )
|
|
|
|
if config.accept:
|