move dynbk tests into scripts/ and update them

34 files changed, 71 insertions, 55 deletions

diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/Makefile b/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/all.T b/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/all.T
deleted file mode 100644
index 7d1969206e..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/all.T
+++ /dev/null
@@ -1,2 +0,0 @@
-
-test('dynbk005', normal, ghci_script, ['dynbk005.script'])
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk6/A.hs b/testsuite/tests/ghc-regress/ghci.debugger/dynbk6/A.hs
deleted file mode 100644
index 139597f9cb..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk6/A.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk6/Makefile b/testsuite/tests/ghc-regress/ghci.debugger/dynbk6/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk6/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk6/all.T b/testsuite/tests/ghc-regress/ghci.debugger/dynbk6/all.T
deleted file mode 100644
index df0e944e48..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk6/all.T
+++ /dev/null
@@ -1,2 +0,0 @@
-
-test('dynbk006', normal, ghci_script, ['dynbk006.script'])
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk6/dynbk006.script b/testsuite/tests/ghc-regress/ghci.debugger/dynbk6/dynbk006.script
deleted file mode 100644
index f39b507237..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk6/dynbk006.script
+++ /dev/null
@@ -1,2 +0,0 @@
--- Higher order Test: ensure dictionaries, coercions and friends don't show up
-
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/Makefile b/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/all.T b/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/all.T
deleted file mode 100644
index f51b467cb7..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/all.T
+++ /dev/null
@@ -1,2 +0,0 @@
-
-test('dynbk007', normal, ghci_script, ['dynbk007.script'])
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/dynbk007.script b/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/dynbk007.script
deleted file mode 100644
index f34c4c7dc2..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/dynbk007.script
+++ /dev/null
@@ -1,7 +0,0 @@
--- Breakpoints in do statements
-
-:set -fdebugging
-:l A.hs
--- :break add Main 3  This bkpt gets coalesced due to empty local bindings, which is fine
-:break add Main 4
-:break add Main 5
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/dynbk007.stderr b/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/dynbk007.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/dynbk007.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/dynbk007.stdout b/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/dynbk007.stdout
deleted file mode 100644
index 7239fd7ecd..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/dynbk007.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-Breakpoint set at main:Main:4:8
-Breakpoint set at main:Main:5:8
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/Makefile b/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/all.T b/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/all.T
deleted file mode 100644
index 5ad144a5c2..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/all.T
+++ /dev/null
@@ -1,2 +0,0 @@
-
-test('dynbk008', normal, ghci_script, ['dynbk008.script'])
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/dynbk008.stderr b/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/dynbk008.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/dynbk008.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/dynbk008.stdout b/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/dynbk008.stdout
deleted file mode 100644
index 6beab3bcd5..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/dynbk008.stdout
+++ /dev/null
@@ -1 +0,0 @@
-Breakpoint set at main:Main:4:6
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/Makefile b/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/all.T b/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/all.T
deleted file mode 100644
index a58df94447..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/all.T
+++ /dev/null
@@ -1,2 +0,0 @@
-
-test('dynbk009', normal, ghci_script, ['dynbk009.script'])
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/dynbk009.script b/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/dynbk009.script
deleted file mode 100644
index ed103fef9d..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/dynbk009.script
+++ /dev/null
@@ -1,7 +0,0 @@
--- Instrumentation should not set breakpoints around unlifted values
-
-:set -fdebugging
-:l A.hs
-
-:show breakpoints
-test
\ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/dynbk009.stderr b/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/dynbk009.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/dynbk009.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/dynbk009.stdout b/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/dynbk009.stdout
deleted file mode 100644
index 01e2fcb4d8..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/dynbk009.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-Main:
-3
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/TupleN.hs b/testsuite/tests/ghc-regress/ghci.debugger/scripts/TupleN.hs
index 528f0ea238..528f0ea238 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/TupleN.hs
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/TupleN.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/all.T b/testsuite/tests/ghc-regress/ghci.debugger/scripts/all.T
index 1fe8fc4842..6f9a906e23 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/all.T
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/all.T
@@ -45,6 +45,10 @@ test('dynbrk001', normal, ghci_script, ['dynbrk001.script'])
 test('dynbrk002', normal, ghci_script, ['dynbrk002.script'])
 test('dynbrk003', normal, ghci_script, ['dynbrk003.script'])
 test('dynbrk004', normal, ghci_script, ['dynbrk004.script'])
+test('dynbrk005', normal, ghci_script, ['dynbrk005.script'])
+test('dynbrk007', normal, ghci_script, ['dynbrk007.script'])
+test('dynbrk008', normal, ghci_script, ['dynbrk008.script'])
+test('dynbrk009', normal, ghci_script, ['dynbrk009.script'])
 
 test('result001', normal, ghci_script, ['result001.script'])
 
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/A.hs b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.hs
index 12e06e8e73..12e06e8e73 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/A.hs
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/dynbk005.script b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.script
index e81cf920db..101c0969eb 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/dynbk005.script
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.script
@@ -2,5 +2,9 @@
 
 :set -fglasgow-exts
 :set -fth
-:l A
-:show breaks
\ No newline at end of file
+:l dynbrk005
+:st normal_fn2 [1,2,3]
+:st
+:st
+:st
+:st
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/dynbk005.stdout b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.stdout
index 27daadd894..27daadd894 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk5/dynbk005.stdout
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/A.hs b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.hs
index dc02170216..dc02170216 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk7/A.hs
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.script b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.script
new file mode 100644
index 0000000000..1f40a2255f
--- /dev/null
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.script
@@ -0,0 +1,7 @@
+-- Breakpoints in do statements
+:l dynbrk007.hs
+:st f
+:st
+:st
+:st
+:st
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.stdout b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.stdout
new file mode 100644
index 0000000000..e07d7deeec
--- /dev/null
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.stdout
@@ -0,0 +1,11 @@
+Stopped at dynbrk007.hs:(2,4)-(6,10)
+_result :: Maybe Int
+Stopped at dynbrk007.hs:3:8-15
+_result :: Maybe Int
+Stopped at dynbrk007.hs:4:8-15
+_result :: Maybe Integer
+Stopped at dynbrk007.hs:5:8-15
+_result :: Maybe Integer
+Stopped at dynbrk007.hs:6:3-10
+_result :: Maybe Int
+i :: Int
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/A.hs b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.hs
index 8fbde66d21..8fbde66d21 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/A.hs
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/dynbk008.script b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.script
index 6184079d02..e99ee6076e 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk8/dynbk008.script
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.script
@@ -1,7 +1,9 @@
 -- Breakpoints on binding sites that start with a List Comprehension are being coalesced, since list comp. are desugared to Lets and we coalesce bkpts for Lets (since there will be a breakpoint at body of the Let anyway)
 
-:set -fdebugging
-:l A.hs
-
-:break add Main 2
-
+:l dynbrk008.hs
+:st f 42
+:st
+:st
+:st
+:st
+:st
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.stdout b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.stdout
new file mode 100644
index 0000000000..86026e7693
--- /dev/null
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.stdout
@@ -0,0 +1,15 @@
+Stopped at dynbrk008.hs:2:0-40
+_result :: [Int]
+Stopped at dynbrk008.hs:2:6-40
+_result :: [Int]
+i :: Int
+Stopped at dynbrk008.hs:2:17-19
+_result :: [Int]
+i :: Int
+Stopped at dynbrk008.hs:2:27-29
+_result :: [Int]
+j :: Int
+Stopped at dynbrk008.hs:2:37-39
+_result :: [Int]
+h :: Int
+[42]
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/A.hs b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.hs
index 77ac75fe64..77ac75fe64 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/dynbk9/A.hs
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.script b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.script
new file mode 100644
index 0000000000..7d00f193a5
--- /dev/null
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.script
@@ -0,0 +1,10 @@
+-- Instrumentation should not set breakpoints around unlifted values.
+-- Also unlifted types are not bound at a breakpoint currently.
+
+:l dynbrk009.hs
+:st test
+:st
+:st
+:st
+:st
+:st
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.stdout b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.stdout
new file mode 100644
index 0000000000..a0f4757cb7
--- /dev/null
+++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.stdout
@@ -0,0 +1,11 @@
+Stopped at dynbrk009.hs:8:18
+_result :: Int
+Stopped at dynbrk009.hs:8:23-31
+_result :: Int
+Stopped at dynbrk009.hs:8:26-30
+_result :: Int
+Stopped at dynbrk009.hs:6:0-8
+_result :: Int
+Stopped at dynbrk009.hs:6:8
+_result :: Int
+3