[commit: ghc] master: Fix failing test T12504 (8bd3d41)

git at git.haskell.org git at git.haskell.org
Wed Sep 21 07:40:56 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8bd3d417e67e5e938dd5bfc640c3efbb683ee309/ghc

>---------------------------------------------------------------

commit 8bd3d417e67e5e938dd5bfc640c3efbb683ee309
Author: Tamar Christina <tamar at zhox.com>
Date:   Wed Sep 21 01:51:47 2016 +0100

    Fix failing test T12504
    
    Summary:
    Test T12504 does it's checking in the Makefile using grep but still specified an stdout.
    the stdout has the old output and would always fail.
    
    Since the stdout isn't needed, let's not check it.
    
    Test Plan: make test TEST=T12504
    
    Reviewers: bgamari, austin, erikd, rcook
    
    Reviewed By: rcook
    
    Subscribers: thomie, #ghc_windows_task_force
    
    Differential Revision: https://phabricator.haskell.org/D2537
    
    GHC Trac Issues: #12504


>---------------------------------------------------------------

8bd3d417e67e5e938dd5bfc640c3efbb683ee309
 testsuite/tests/hsc2hs/T12504.stdout | 2 --
 testsuite/tests/hsc2hs/all.T         | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/testsuite/tests/hsc2hs/T12504.stdout b/testsuite/tests/hsc2hs/T12504.stdout
deleted file mode 100644
index c1c05d0..0000000
--- a/testsuite/tests/hsc2hs/T12504.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-{-# LINE 1 "T12504/path/to/T12504.hsc" #-}
-{-# LINE 2 "T12504/path/to/T12504.hsc" #-}
diff --git a/testsuite/tests/hsc2hs/all.T b/testsuite/tests/hsc2hs/all.T
index 3f910db..23628b2 100644
--- a/testsuite/tests/hsc2hs/all.T
+++ b/testsuite/tests/hsc2hs/all.T
@@ -38,6 +38,7 @@ test('T10272',
 
 test('T12504',
      [extra_clean(['T12504/path/to/T12504.hs']),
-      extra_files(['T12504'])],
+      extra_files(['T12504']),
+      ignore_stdout],
      run_command,
      ['$MAKE -s --no-print-directory T12504'])



More information about the ghc-commits mailing list