rename these tests from conc* to stm*
authorSimon Marlow <marlowsd@gmail.com>
Tue, 30 Mar 2010 14:26:23 +0000 (14:26 +0000)
committerSimon Marlow <marlowsd@gmail.com>
Tue, 30 Mar 2010 14:26:23 +0000 (14:26 +0000)
32 files changed:
tests/all.T
tests/conc055.stderr [deleted file]
tests/conc056.stderr [deleted file]
tests/stm046.hs [moved from tests/conc046.hs with 100% similarity]
tests/stm046.stderr [moved from tests/conc046.stderr with 100% similarity]
tests/stm046.stdout [moved from tests/conc046.stdout with 100% similarity]
tests/stm047.hs [moved from tests/conc047.hs with 100% similarity]
tests/stm047.stderr [moved from tests/conc047.stderr with 100% similarity]
tests/stm047.stdout [moved from tests/conc047.stdout with 100% similarity]
tests/stm048.hs [moved from tests/conc048.hs with 100% similarity]
tests/stm048.stderr [moved from tests/conc048.stderr with 100% similarity]
tests/stm048.stdout [moved from tests/conc048.stdout with 100% similarity]
tests/stm049.hs [moved from tests/conc049.hs with 100% similarity]
tests/stm050.hs [moved from tests/conc050.hs with 100% similarity]
tests/stm052.hs [moved from tests/conc052.hs with 100% similarity]
tests/stm052.stderr [moved from tests/conc052.stderr with 100% similarity]
tests/stm052.stdout [moved from tests/conc052.stdout with 100% similarity]
tests/stm053.hs [moved from tests/conc053.hs with 100% similarity]
tests/stm054.hs [moved from tests/conc054.hs with 100% similarity]
tests/stm054.stdout [moved from tests/conc054.stdout with 100% similarity]
tests/stm055.hs [moved from tests/conc055.hs with 100% similarity]
tests/stm055.stderr [new file with mode: 0644]
tests/stm056.hs [moved from tests/conc056.hs with 100% similarity]
tests/stm056.stderr [new file with mode: 0644]
tests/stm060.hs [moved from tests/conc060.hs with 100% similarity]
tests/stm060.stdout [moved from tests/conc060.stdout with 100% similarity]
tests/stm061.hs [moved from tests/conc061.hs with 100% similarity]
tests/stm061.stdout [moved from tests/conc061.stdout with 100% similarity]
tests/stm062.hs [moved from tests/conc062.hs with 100% similarity]
tests/stm062.stdout [moved from tests/conc062.stdout with 100% similarity]
tests/stm063.hs [moved from tests/conc063.hs with 100% similarity]
tests/stm063.stdout [moved from tests/conc063.stdout with 100% similarity]

index be5019b..eace3dd 100644 (file)
@@ -1,36 +1,36 @@
-test('conc046', only_compiler_types(['ghc']), compile_and_run, [''])
+test('stm046', only_compiler_types(['ghc']), compile_and_run, [''])
 
 # Omit GHCi for these two, since they appear to deadlock (23/11/2004 --SDM)
-test('conc047',
+test('stm047',
      composes([only_compiler_types(['ghc']), 
                omit_ways(['ghci']),
                if_compiler_lt('ghc', '6.9', omit_ways(['ghci', 'threaded2']))]),
      compile_and_run, [''])
-test('conc048',
+test('stm048',
      composes([only_compiler_types(['ghc']), 
                omit_ways(['ghci']),
                if_compiler_lt('ghc', '6.9', omit_ways(['ghci', 'threaded2']))]),
      compile_and_run, [''])
 
-test('conc049', only_compiler_types(['ghc']), compile_and_run, ['-package stm'])
-test('conc050', compose(only_compiler_types(['ghc']), extra_run_opts('10000')), compile_and_run, ['-package stm'])
+test('stm049', only_compiler_types(['ghc']), compile_and_run, ['-package stm'])
+test('stm050', compose(only_compiler_types(['ghc']), extra_run_opts('10000')), compile_and_run, ['-package stm'])
 
 # Was failing prof ways due to #1547, but now apparently succeeds:
-test('conc052', if_compiler_lt('ghc', '6.9', 
+test('stm052', if_compiler_lt('ghc', '6.9', 
                                expect_broken_for(1547,['profc','profasm'])),
      compile_and_run, ['-package stm'])
 
-test('conc053', compose(only_ways(['threaded1','threaded2']),
+test('stm053', compose(only_ways(['threaded1','threaded2']),
                        if_platform('i386-unknown-mingw32', skip)),
                 compile_and_run, ['-package stm'])
-test('conc054', normal, compile_and_run, ['-package stm'])
-test('conc055', exit_code(1), compile_and_run, ['-package stm'])
-test('conc056', only_ways(['threaded1','threaded2']),
+test('stm054', normal, compile_and_run, ['-package stm'])
+test('stm055', exit_code(1), compile_and_run, ['-package stm'])
+test('stm056', only_ways(['threaded1','threaded2']),
                 compile_and_run, ['-package stm'])
 
-test('conc060', normal, compile_and_run, ['-package stm'])
-test('conc061', normal, compile_and_run, ['-package stm'])
-test('conc062', normal, compile_and_run, ['-package stm'])
-test('conc063', skip_if_fast, compile_and_run, ['-package stm'])
+test('stm060', normal, compile_and_run, ['-package stm'])
+test('stm061', normal, compile_and_run, ['-package stm'])
+test('stm062', normal, compile_and_run, ['-package stm'])
+test('stm063', skip_if_fast, compile_and_run, ['-package stm'])
 test('2411', ignore_output, compile_and_run, ['-package stm'])
 test('3049', normal, compile_and_run, ['-package stm'])
diff --git a/tests/conc055.stderr b/tests/conc055.stderr
deleted file mode 100644 (file)
index f322a76..0000000
+++ /dev/null
@@ -1 +0,0 @@
-conc055: Control.Concurrent.STM.atomically was nested
diff --git a/tests/conc056.stderr b/tests/conc056.stderr
deleted file mode 100644 (file)
index 957df4f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-conc056: divide by zero
similarity index 100%
rename from tests/conc046.hs
rename to tests/stm046.hs
similarity index 100%
rename from tests/conc046.stderr
rename to tests/stm046.stderr
similarity index 100%
rename from tests/conc046.stdout
rename to tests/stm046.stdout
similarity index 100%
rename from tests/conc047.hs
rename to tests/stm047.hs
similarity index 100%
rename from tests/conc047.stderr
rename to tests/stm047.stderr
similarity index 100%
rename from tests/conc047.stdout
rename to tests/stm047.stdout
similarity index 100%
rename from tests/conc048.hs
rename to tests/stm048.hs
similarity index 100%
rename from tests/conc048.stderr
rename to tests/stm048.stderr
similarity index 100%
rename from tests/conc048.stdout
rename to tests/stm048.stdout
similarity index 100%
rename from tests/conc049.hs
rename to tests/stm049.hs
similarity index 100%
rename from tests/conc050.hs
rename to tests/stm050.hs
similarity index 100%
rename from tests/conc052.hs
rename to tests/stm052.hs
similarity index 100%
rename from tests/conc052.stderr
rename to tests/stm052.stderr
similarity index 100%
rename from tests/conc052.stdout
rename to tests/stm052.stdout
similarity index 100%
rename from tests/conc053.hs
rename to tests/stm053.hs
similarity index 100%
rename from tests/conc054.hs
rename to tests/stm054.hs
similarity index 100%
rename from tests/conc054.stdout
rename to tests/stm054.stdout
similarity index 100%
rename from tests/conc055.hs
rename to tests/stm055.hs
diff --git a/tests/stm055.stderr b/tests/stm055.stderr
new file mode 100644 (file)
index 0000000..db3ac7d
--- /dev/null
@@ -0,0 +1 @@
+stm055: Control.Concurrent.STM.atomically was nested
similarity index 100%
rename from tests/conc056.hs
rename to tests/stm056.hs
diff --git a/tests/stm056.stderr b/tests/stm056.stderr
new file mode 100644 (file)
index 0000000..1af622f
--- /dev/null
@@ -0,0 +1 @@
+stm056: divide by zero
similarity index 100%
rename from tests/conc060.hs
rename to tests/stm060.hs
similarity index 100%
rename from tests/conc060.stdout
rename to tests/stm060.stdout
similarity index 100%
rename from tests/conc061.hs
rename to tests/stm061.hs
similarity index 100%
rename from tests/conc061.stdout
rename to tests/stm061.stdout
similarity index 100%
rename from tests/conc062.hs
rename to tests/stm062.hs
similarity index 100%
rename from tests/conc062.stdout
rename to tests/stm062.stdout
similarity index 100%
rename from tests/conc063.hs
rename to tests/stm063.hs
similarity index 100%
rename from tests/conc063.stdout
rename to tests/stm063.stdout