Testsuite: run tests in <testdir>.run instead of /tmp

As discussed in Phab:D1187, this approach makes it a bit easier to
inspect the test directory while working on a new test.

The only tests that needed changes are the ones that refer to files in
ancestor directories. Those files are now copied directly into the test
directory.

validate still runs the tests in a temporary directory in /tmp, see
`Note [Running tests in /tmp]` in testsuite/driver/runtests.py.

Update submodule hpc.

Reviewed by: simonmar

Differential Revision: https://phabricator.haskell.org/D2333

GHC Trac Issues: #11980

6 files changed, 43 insertions, 43 deletions

diff --git a/testsuite/tests/ghci/scripts/Defer02.script b/testsuite/tests/ghci/scripts/Defer02.script
index 3fc6aff5b0..3ff0bee911 100755
--- a/testsuite/tests/ghci/scripts/Defer02.script
+++ b/testsuite/tests/ghci/scripts/Defer02.script
@@ -1,6 +1,6 @@
 -- Test -fwarn-type-errors
 -- This test shows how each error is printed at runtime
-:l ../../typecheck/should_run/Defer01
+:l Defer01
 t5624
 print a
 print (b B)
@@ -11,4 +11,4 @@ print (h ())
 print (i ())
 print j
 print (k 2)
-l
\ No newline at end of file
+l
diff --git a/testsuite/tests/ghci/scripts/Defer02.stderr b/testsuite/tests/ghci/scripts/Defer02.stderr
index bcc6c5eff5..f845b63fd2 100644
--- a/testsuite/tests/ghci/scripts/Defer02.stderr
+++ b/testsuite/tests/ghci/scripts/Defer02.stderr
@@ -1,5 +1,5 @@
 

-..\..\typecheck\should_run\Defer01.hs:11:40: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:11:40: warning: [-Wdeferred-type-errors (in -Wdefault)]

     • Couldn't match type ‘Char’ with ‘[Char]’

       Expected type: String

         Actual type: Char

@@ -7,21 +7,21 @@
       In the second argument of ‘(>>)’, namely ‘putStr ','’

       In the expression: putStr "Hello World" >> putStr ','

 

-..\..\typecheck\should_run\Defer01.hs:14:5: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:14:5: warning: [-Wdeferred-type-errors (in -Wdefault)]

     • Couldn't match expected type ‘Int’ with actual type ‘Char’

     • In the expression: 'p'

       In an equation for ‘a’: a = 'p'

 

-..\..\typecheck\should_run\Defer01.hs:18:7: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:18:7: warning: [-Wdeferred-type-errors (in -Wdefault)]

     • No instance for (Eq B) arising from a use of ‘==’

     • In the expression: x == x

       In an equation for ‘b’: b x = x == x

 

-..\..\typecheck\should_run\Defer01.hs:25:1: warning: [-Woverlapping-patterns (in -Wdefault)]

+Defer01.hs:25:1: warning: [-Woverlapping-patterns (in -Wdefault)]

     Pattern match has inaccessible right hand side

     In an equation for ‘c’: c (C2 x) = ...

 

-..\..\typecheck\should_run\Defer01.hs:25:4: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:25:4: warning: [-Wdeferred-type-errors (in -Wdefault)]

     • Couldn't match type ‘Int’ with ‘Bool’

       Inaccessible code in

         a pattern with constructor: C2 :: Bool -> C Bool,

@@ -29,50 +29,50 @@
     • In the pattern: C2 x

       In an equation for ‘c’: c (C2 x) = True

 

-..\..\typecheck\should_run\Defer01.hs:28:5: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:28:5: warning: [-Wdeferred-type-errors (in -Wdefault)]

     • No instance for (Num (a -> a)) arising from the literal ‘1’

         (maybe you haven't applied a function to enough arguments?)

     • In the expression: 1

       In an equation for ‘d’: d = 1

 

-..\..\typecheck\should_run\Defer01.hs:31:5: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:31:5: warning: [-Wdeferred-type-errors (in -Wdefault)]

     • Couldn't match expected type ‘Char -> t’ with actual type ‘Char’

     • The function ‘e’ is applied to one argument,

       but its type ‘Char’ has none

       In the expression: e 'q'

       In an equation for ‘f’: f = e 'q'

     • Relevant bindings include

-        f :: t (bound at ..\..\typecheck\should_run\Defer01.hs:31:1)

+        f :: t (bound at Defer01.hs:31:1)

 

-..\..\typecheck\should_run\Defer01.hs:34:8: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:34:8: warning: [-Wdeferred-type-errors (in -Wdefault)]

     • Couldn't match expected type ‘Char’ with actual type ‘a’

       ‘a’ is a rigid type variable bound by

         the type signature for:

           h :: forall a. a -> (Char, Char)

-        at ..\..\typecheck\should_run\Defer01.hs:33:1-21

+        at Defer01.hs:33:1-21

     • In the expression: x

       In the expression: (x, 'c')

       In an equation for ‘h’: h x = (x, 'c')

     • Relevant bindings include

-        x :: a (bound at ..\..\typecheck\should_run\Defer01.hs:34:3)

+        x :: a (bound at Defer01.hs:34:3)

         h :: a -> (Char, Char)

-          (bound at ..\..\typecheck\should_run\Defer01.hs:34:1)

+          (bound at Defer01.hs:34:1)

 

-..\..\typecheck\should_run\Defer01.hs:39:17: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:39:17: warning: [-Wdeferred-type-errors (in -Wdefault)]

     • Couldn't match expected type ‘Bool’ with actual type ‘T a’

     • In the first argument of ‘not’, namely ‘(K a)’

       In the expression: (not (K a))

       In the expression: seq (not (K a)) ()

     • Relevant bindings include

-        a :: a (bound at ..\..\typecheck\should_run\Defer01.hs:39:3)

-        i :: a -> () (bound at ..\..\typecheck\should_run\Defer01.hs:39:1)

+        a :: a (bound at Defer01.hs:39:3)

+        i :: a -> () (bound at Defer01.hs:39:1)

 

-..\..\typecheck\should_run\Defer01.hs:43:5: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:43:5: warning: [-Wdeferred-type-errors (in -Wdefault)]

     • No instance for (MyClass a1) arising from a use of ‘myOp’

     • In the expression: myOp 23

       In an equation for ‘j’: j = myOp 23

 

-..\..\typecheck\should_run\Defer01.hs:43:10: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:43:10: warning: [-Wdeferred-type-errors (in -Wdefault)]

     • Ambiguous type variable ‘a1’ arising from the literal ‘23’

       prevents the constraint ‘(Num a1)’ from being solved.

       Probable fix: use a type annotation to specify what ‘a1’ should be.

@@ -86,13 +86,13 @@
       In the expression: myOp 23

       In an equation for ‘j’: j = myOp 23

 

-..\..\typecheck\should_run\Defer01.hs:45:1: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:45:1: warning: [-Wdeferred-type-errors (in -Wdefault)]

     Couldn't match type ‘Int’ with ‘Bool’

     Inaccessible code in

       the type signature for:

         k :: Int ~ Bool => Int -> Bool

 

-..\..\typecheck\should_run\Defer01.hs:45:6: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:45:6: warning: [-Wdeferred-type-errors (in -Wdefault)]

     • Couldn't match type ‘Int’ with ‘Bool’

       Inaccessible code in

         the type signature for:

@@ -101,18 +101,18 @@
       To defer the ambiguity check to use sites, enable AllowAmbiguousTypes

       In the type signature: k :: (Int ~ Bool) => Int -> Bool

 

-..\..\typecheck\should_run\Defer01.hs:46:1: warning: [-Woverlapping-patterns (in -Wdefault)]

+Defer01.hs:46:1: warning: [-Woverlapping-patterns (in -Wdefault)]

     Pattern match is redundant

     In an equation for ‘k’: k x = ...

 

-..\..\typecheck\should_run\Defer01.hs:49:5: warning: [-Wdeferred-type-errors (in -Wdefault)]

+Defer01.hs:49:5: warning: [-Wdeferred-type-errors (in -Wdefault)]

     • Couldn't match expected type ‘IO a0’

                   with actual type ‘Char -> IO ()’

     • Probable cause: ‘putChar’ is applied to too few arguments

       In the first argument of ‘(>>)’, namely ‘putChar’

       In the expression: putChar >> putChar 'p'

       In an equation for ‘l’: l = putChar >> putChar 'p'

-*** Exception: ..\..\typecheck\should_run\Defer01.hs:11:40: error:

+*** Exception: Defer01.hs:11:40: error:

     • Couldn't match type ‘Char’ with ‘[Char]’

       Expected type: String

         Actual type: Char

@@ -120,12 +120,12 @@
       In the second argument of ‘(>>)’, namely ‘putStr ','’

       In the expression: putStr "Hello World" >> putStr ','

 (deferred type error)

-*** Exception: ..\..\typecheck\should_run\Defer01.hs:14:5: error:

+*** Exception: Defer01.hs:14:5: error:

     • Couldn't match expected type ‘Int’ with actual type ‘Char’

     • In the expression: 'p'

       In an equation for ‘a’: a = 'p'

 (deferred type error)

-*** Exception: ..\..\typecheck\should_run\Defer01.hs:18:7: error:

+*** Exception: Defer01.hs:18:7: error:

     • No instance for (Eq B) arising from a use of ‘==’

     • In the expression: x == x

       In an equation for ‘b’: b x = x == x

@@ -138,45 +138,45 @@
     • In the first argument of ‘c’, namely ‘(C2 True)’

       In the first argument of ‘print’, namely ‘(c (C2 True))’

       In the expression: print (c (C2 True))

-*** Exception: ..\..\typecheck\should_run\Defer01.hs:28:5: error:

+*** Exception: Defer01.hs:28:5: error:

     • No instance for (Num (a -> a)) arising from the literal ‘1’

         (maybe you haven't applied a function to enough arguments?)

     • In the expression: 1

       In an equation for ‘d’: d = 1

 (deferred type error)

-*** Exception: ..\..\typecheck\should_run\Defer01.hs:31:5: error:

+*** Exception: Defer01.hs:31:5: error:

     • Couldn't match expected type ‘Char -> t’ with actual type ‘Char’

     • The function ‘e’ is applied to one argument,

       but its type ‘Char’ has none

       In the expression: e 'q'

       In an equation for ‘f’: f = e 'q'

     • Relevant bindings include

-        f :: t (bound at ..\..\typecheck\should_run\Defer01.hs:31:1)

+        f :: t (bound at Defer01.hs:31:1)

 (deferred type error)

-*** Exception: ..\..\typecheck\should_run\Defer01.hs:34:8: error:

+*** Exception: Defer01.hs:34:8: error:

     • Couldn't match expected type ‘Char’ with actual type ‘a’

       ‘a’ is a rigid type variable bound by

         the type signature for:

           h :: forall a. a -> (Char, Char)

-        at ..\..\typecheck\should_run\Defer01.hs:33:1-21

+        at Defer01.hs:33:1-21

     • In the expression: x

       In the expression: (x, 'c')

       In an equation for ‘h’: h x = (x, 'c')

     • Relevant bindings include

-        x :: a (bound at ..\..\typecheck\should_run\Defer01.hs:34:3)

+        x :: a (bound at Defer01.hs:34:3)

         h :: a -> (Char, Char)

-          (bound at ..\..\typecheck\should_run\Defer01.hs:34:1)

+          (bound at Defer01.hs:34:1)

 (deferred type error)

-*** Exception: ..\..\typecheck\should_run\Defer01.hs:39:17: error:

+*** Exception: Defer01.hs:39:17: error:

     • Couldn't match expected type ‘Bool’ with actual type ‘T a’

     • In the first argument of ‘not’, namely ‘(K a)’

       In the expression: (not (K a))

       In the expression: seq (not (K a)) ()

     • Relevant bindings include

-        a :: a (bound at ..\..\typecheck\should_run\Defer01.hs:39:3)

-        i :: a -> () (bound at ..\..\typecheck\should_run\Defer01.hs:39:1)

+        a :: a (bound at Defer01.hs:39:3)

+        i :: a -> () (bound at Defer01.hs:39:1)

 (deferred type error)

-*** Exception: ..\..\typecheck\should_run\Defer01.hs:43:5: error:

+*** Exception: Defer01.hs:43:5: error:

     • No instance for (MyClass a1) arising from a use of ‘myOp’

     • In the expression: myOp 23

       In an equation for ‘j’: j = myOp 23

@@ -187,7 +187,7 @@
     • In the first argument of ‘print’, namely ‘(k 2)’

       In the expression: print (k 2)

       In an equation for ‘it’: it = print (k 2)

-*** Exception: ..\..\typecheck\should_run\Defer01.hs:49:5: error:

+*** Exception: Defer01.hs:49:5: error:

     • Couldn't match expected type ‘IO a0’

                   with actual type ‘Char -> IO ()’

     • Probable cause: ‘putChar’ is applied to too few arguments

diff --git a/testsuite/tests/ghci/scripts/T6106.script b/testsuite/tests/ghci/scripts/T6106.script
index be6de46362..e8761542e1 100644
--- a/testsuite/tests/ghci/scripts/T6106.script
+++ b/testsuite/tests/ghci/scripts/T6106.script
@@ -1,4 +1,4 @@
-:l ../shell.hs
+:l shell.hs
 :def shell (\s -> do shell s; return "")
 :l
 
diff --git a/testsuite/tests/ghci/scripts/ghci026.script b/testsuite/tests/ghci/scripts/ghci026.script
index 871de86741..0f77a7ad50 100644
--- a/testsuite/tests/ghci/scripts/ghci026.script
+++ b/testsuite/tests/ghci/scripts/ghci026.script
@@ -1,6 +1,6 @@
 import Data.Maybe
 :browse
-:l ../prog002/A1.hs
+:l prog002/A1.hs
 :browse
-:add ../prog002/B.hs
+:add prog002/B.hs
 :browse
diff --git a/testsuite/tests/ghci/scripts/ghci038.script b/testsuite/tests/ghci/scripts/ghci038.script
index fabc8b5564..c534cfc5b2 100644
--- a/testsuite/tests/ghci/scripts/ghci038.script
+++ b/testsuite/tests/ghci/scripts/ghci038.script
@@ -1,5 +1,5 @@
 -- Tests for ":show imports" and import/:module
-:l ../shell.hs
+:l shell.hs
 :def shell (\s -> do shell s; return "")
 :l
 
diff --git a/testsuite/tests/ghci/scripts/ghci058.script b/testsuite/tests/ghci/scripts/ghci058.script
index a05aa73ccc..c9bbd696f5 100644
--- a/testsuite/tests/ghci/scripts/ghci058.script
+++ b/testsuite/tests/ghci/scripts/ghci058.script
@@ -1,5 +1,5 @@
 
-:l ../shell.hs
+:l shell.hs
 :def shell (\s -> do shell s; return "")
 
 :set prompt ""