From 4abd32a6f73e78af6a75c689aa89330d69f098f4 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 1 Jan 2010 14:06:41 +0000 Subject: Fix some test name collisions --- testsuite/tests/ghc-regress/ghci.debugger/scripts/all.T | 4 ++-- .../ghc-regress/ghci.debugger/scripts/list001.script | 13 ------------- .../ghc-regress/ghci.debugger/scripts/list001.stdout | 15 --------------- .../tests/ghc-regress/ghci.debugger/scripts/list002.hs | 5 ----- .../ghc-regress/ghci.debugger/scripts/list002.script | 4 ---- .../ghc-regress/ghci.debugger/scripts/list002.stdout | 6 ------ .../ghci.debugger/scripts/listCommand001.script | 13 +++++++++++++ .../ghci.debugger/scripts/listCommand001.stdout | 15 +++++++++++++++ .../ghc-regress/ghci.debugger/scripts/listCommand002.hs | 5 +++++ .../ghci.debugger/scripts/listCommand002.script | 4 ++++ .../ghci.debugger/scripts/listCommand002.stdout | 6 ++++++ 11 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 testsuite/tests/ghc-regress/ghci.debugger/scripts/list001.script delete mode 100644 testsuite/tests/ghc-regress/ghci.debugger/scripts/list001.stdout delete mode 100644 testsuite/tests/ghc-regress/ghci.debugger/scripts/list002.hs delete mode 100644 testsuite/tests/ghc-regress/ghci.debugger/scripts/list002.script delete mode 100644 testsuite/tests/ghc-regress/ghci.debugger/scripts/list002.stdout create mode 100644 testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand001.script create mode 100644 testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand001.stdout create mode 100644 testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.hs create mode 100644 testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.script create mode 100644 testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.stdout (limited to 'testsuite/tests/ghc-regress/ghci.debugger') diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/all.T b/testsuite/tests/ghc-regress/ghci.debugger/scripts/all.T index 514d9c5385..95cca2d651 100644 --- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/all.T +++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/all.T @@ -75,8 +75,8 @@ test('dynbrk009', normal, ghci_script, ['dynbrk009.script']) test('result001', expect_broken(1531), ghci_script, ['result001.script']) -test('list001', normal, ghci_script, ['list001.script']) -test('list002', normal, ghci_script, ['list002.script']) +test('listCommand001', normal, ghci_script, ['listCommand001.script']) +test('listCommand002', normal, ghci_script, ['listCommand002.script']) test('hist001', normal, ghci_script, ['hist001.script']) diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/list001.script b/testsuite/tests/ghc-regress/ghci.debugger/scripts/list001.script deleted file mode 100644 index 767b27c47f..0000000000 --- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/list001.script +++ /dev/null @@ -1,13 +0,0 @@ -:list --- should fail, nothing to list -:list Data.List 20 --- can't list a compiled module -:list Data.List.map --- can't list a compiled module -:l ../Test3.hs -:list mymap -:list main -:list 4 --- wrong syntax: -:list a b c -:list 10 20 diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/list001.stdout b/testsuite/tests/ghc-regress/ghci.debugger/scripts/list001.stdout deleted file mode 100644 index 26a27ac5a5..0000000000 --- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/list001.stdout +++ /dev/null @@ -1,15 +0,0 @@ -Not stopped at a breakpoint; nothing to list -module 'Data.List' is from another package; -this command requires an interpreted module -cannot list source code for map: module GHC.Base is not interpreted -1 mymap f [] = [] -2 mymap f (x:xs) = f x:mymap f xs -3 -3 -4 main = mapM_ putStrLn $ mymap ('a':) ["hello","bye"] -5 -3 -4 main = mapM_ putStrLn $ mymap ('a':) ["hello","bye"] -5 -syntax: :list [ | | ] -syntax: :list [ | | ] diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/list002.hs b/testsuite/tests/ghc-regress/ghci.debugger/scripts/list002.hs deleted file mode 100644 index 71f3f5482c..0000000000 --- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/list002.hs +++ /dev/null @@ -1,5 +0,0 @@ -import System.Directory - -main = do - setCurrentDirectory ".." - putStrLn "Hello World" \ No newline at end of file diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/list002.script b/testsuite/tests/ghc-regress/ghci.debugger/scripts/list002.script deleted file mode 100644 index 1619d1796a..0000000000 --- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/list002.script +++ /dev/null @@ -1,4 +0,0 @@ -:l list002 -:step main -:step -:step \ No newline at end of file diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/list002.stdout b/testsuite/tests/ghc-regress/ghci.debugger/scripts/list002.stdout deleted file mode 100644 index ef37ca3bda..0000000000 --- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/list002.stdout +++ /dev/null @@ -1,6 +0,0 @@ -Stopped at list002.hs:(3,8)-(5,24) -_result :: IO () = _ -Stopped at list002.hs:4:3-26 -_result :: IO () = _ -Stopped at list002.hs:5:3-24 -_result :: IO () = _ diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand001.script b/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand001.script new file mode 100644 index 0000000000..767b27c47f --- /dev/null +++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand001.script @@ -0,0 +1,13 @@ +:list +-- should fail, nothing to list +:list Data.List 20 +-- can't list a compiled module +:list Data.List.map +-- can't list a compiled module +:l ../Test3.hs +:list mymap +:list main +:list 4 +-- wrong syntax: +:list a b c +:list 10 20 diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand001.stdout b/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand001.stdout new file mode 100644 index 0000000000..26a27ac5a5 --- /dev/null +++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand001.stdout @@ -0,0 +1,15 @@ +Not stopped at a breakpoint; nothing to list +module 'Data.List' is from another package; +this command requires an interpreted module +cannot list source code for map: module GHC.Base is not interpreted +1 mymap f [] = [] +2 mymap f (x:xs) = f x:mymap f xs +3 +3 +4 main = mapM_ putStrLn $ mymap ('a':) ["hello","bye"] +5 +3 +4 main = mapM_ putStrLn $ mymap ('a':) ["hello","bye"] +5 +syntax: :list [ | | ] +syntax: :list [ | | ] diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.hs b/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.hs new file mode 100644 index 0000000000..71f3f5482c --- /dev/null +++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.hs @@ -0,0 +1,5 @@ +import System.Directory + +main = do + setCurrentDirectory ".." + putStrLn "Hello World" \ No newline at end of file diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.script b/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.script new file mode 100644 index 0000000000..72abf5291d --- /dev/null +++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.script @@ -0,0 +1,4 @@ +:l listCommand002 +:step main +:step +:step \ No newline at end of file diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.stdout b/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.stdout new file mode 100644 index 0000000000..95854884b2 --- /dev/null +++ b/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.stdout @@ -0,0 +1,6 @@ +Stopped at listCommand002.hs:(3,8)-(5,24) +_result :: IO () = _ +Stopped at listCommand002.hs:4:3-26 +_result :: IO () = _ +Stopped at listCommand002.hs:5:3-24 +_result :: IO () = _ -- cgit v1.2.1