12 files changed, 10 insertions, 126 deletions
diff --git a/testsuite/Makefile b/testsuite/Makefile
index 7336f172c0..9bb1c7d11e 100644
--- a/testsuite/Makefile
+++ b/testsuite/Makefile
@@ -1,4 +1,3 @@
-
 TOP = .
 
 # If we're cleaning then we don't want to do all the GHC detection hardwork,
diff --git a/testsuite/config/ghc b/testsuite/config/ghc
index 1f77cc54fd..36f74e4935 100644
--- a/testsuite/config/ghc
+++ b/testsuite/config/ghc
@@ -56,6 +56,7 @@ if (ghc_with_profiling == 1 and ghc_with_threaded_rts == 1):
     config.run_ways.append('profthreaded')
 
 if (ghc_with_llvm == 1):
+    config.compile_ways.append('optllvm')
     config.run_ways.append('optllvm')
 
 config.in_tree_compiler = in_tree_compiler
@@ -157,3 +158,4 @@ def get_compiler_info():
         config.package_conf_cache_file = compilerInfoDict["Global Package DB"] + '/package.cache'
     except:
         config.package_conf_cache_file = ''
+
diff --git a/testsuite/config/hugs b/testsuite/config/hugs
deleted file mode 100644
index 5be508a63c..0000000000
--- a/testsuite/config/hugs
+++ /dev/null
@@ -1,21 +0,0 @@
-# Testsuite configuration setup for Hugs
-#
-# This file is Python source
-#
-config.compiler_type         = 'hugs'
-config.compiler              = 'hugs-hc'
-config.compiler_always_flags = []
-
-# We test the 'normal' way only
-config.compile_ways	     = ['normal']
-config.run_ways		     = ['normal']
-
-# No other ways for Hugs
-config.other_ways            = []
-
-config.way_flags = { 'normal' : [] }
-config.way_rts_flags = { 'normal' : [] }
-
-def get_compiler_info():
-    pass
-
diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py
index 5f7d735653..ec1c046077 100644
--- a/testsuite/driver/runtests.py
+++ b/testsuite/driver/runtests.py
@@ -2,10 +2,6 @@
 # (c) Simon Marlow 2002
 #
 
-# ToDo:
-#   GHCi tests
-#   expect failure for some ways only
-
 import sys
 import os
 import string
diff --git a/testsuite/ghci054.script b/testsuite/ghci054.script
deleted file mode 100644
index 7c17087ece..0000000000
--- a/testsuite/ghci054.script
+++ /dev/null
@@ -1,4 +0,0 @@
---Testing type synonyms
-type Foo = String
-let foo = "foo" :: Foo
-:t foo
diff --git a/testsuite/tests/KNOWN_FAILURES b/testsuite/tests/KNOWN_FAILURES
deleted file mode 100644
index cb9b5e0f9b..0000000000
--- a/testsuite/tests/KNOWN_FAILURES
+++ /dev/null
@@ -1,50 +0,0 @@
-Current known failures
-~~~~~~~~~~~~~~~~~~~~~~
-
-deSugar/should_compile/ds052
-		-- inaccuracy in non-exhaustive pattern warnings
-
-lib/IO/hReady001
-		-- IO.hReady doesn't detect the end of a file
-
-lib/IO/openFile005, openFile007, readFile001 [Windows]
-                -- file locking is broken on Windows
-
-lib/IOExts/hTell001, hTell002 [Windows]
-		-- seeking on text handles not implemented on Windows
-
-lib/net/net001 [Windows]
-                -- getProtocolByName seems not to be working on Windows
-
-lib/system/system001 [Windows]
-		-- probably a failure due to System.system using Cmd.exe?
-
-parser/should_fail/read002
-		-- we don't disallow certain characters in strings (eg. newline)
-
-parser/should_fail/read024
-		-- parser bug related to layout processing
-
-rename/should_fail/rnfail034
-		-- duplicated "in" in an error message
-
-typecheck/should_fail/tcfail080
-		-- ambiguity test: ambiguity isn't detected early enough
-		-- (behaviour is sound but could be more helpful, according
-		-- to SPJ)
-
-typecheck/should_run/tcrun007
-		-- tests for generics, which are currently broken in 5.02
-
-programs/okeefe_neural
-		-- causes the compiler to run out of heap in the simplifier
-		-- (problem with large constant data structures?)
-
--- These tests fail the 'optasm' way, due to inconsistent floating
--- point results on x86.  The inconsistency is caused 
-
-numeric/should_run/arith008
-numeric/should_run/arith012
-programs/barton_mangler_bug
-programs/cholewo-eval
-programs/galois_raytrace
diff --git a/testsuite/tests/Makefile b/testsuite/tests/Makefile
index 58d07bc88d..d0fc4ee651 100644
--- a/testsuite/tests/Makefile
+++ b/testsuite/tests/Makefile
@@ -10,9 +10,9 @@ ifeq "$(findstring base,$(LIBRARIES))" ""
 $(error base library does not seem to be installed)
 endif
 
-# XXX Do this better?
 # Now find the "tests" directories of those libraries, where they exist
 LIBRARY_TEST_PATHS := $(wildcard $(patsubst %, $(TOP)/../libraries/%/tests, $(LIBRARIES)))
 
 # Add tests from packages
 RUNTEST_OPTS += $(patsubst %, --rootdir=%, $(LIBRARY_TEST_PATHS))
+
diff --git a/testsuite/tests/NOTES b/testsuite/tests/NOTES
deleted file mode 100644
index a376f1db04..0000000000
--- a/testsuite/tests/NOTES
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Deficiencies
-~~~~~~~~~~~~
-
-typecheck/should_compile tc056,tc115,tc116: stderr not checked
-   (maybe fixed; ToDo: check)
-
-typecheck/should_fail
-   Data82.hs Digraph.hs Digraph.stderr Inst82_1.hs Inst82_2.hs   
-   have not been assimilated.
-   (are needed by tcfail082 but am not sure how to do multi-module
-    tests yet)
-
-rename/should_compile
-   rn037 issues
-
-stranal/should_compile
-   There are some failures in here due to unexpected stdouts
-   (the compiler isn't asked to generate any?)
-
-specialise/
-   Contains complete progs.  Not done yet.
-
-simpleCore/should_compile
-   simpl006 has extra bits
-
-deSugar/should_compile
-   cvh-ds-unboxed/ not done
-
-specialise/
-   none of these are run in the old framework, so not included
-   in new.
-
-
diff --git a/testsuite/timeout/TimeMe.hs b/testsuite/timeout/TimeMe.hs
index 77f60ecdef..5d48265c3f 100644
--- a/testsuite/timeout/TimeMe.hs
+++ b/testsuite/timeout/TimeMe.hs
@@ -1,4 +1,3 @@
-
 module Main (main) where
 
 import System.IO
diff --git a/testsuite/timeout/WinCBindings.hsc b/testsuite/timeout/WinCBindings.hsc
index 0bc1cb7aef..51764dc5df 100644
--- a/testsuite/timeout/WinCBindings.hsc
+++ b/testsuite/timeout/WinCBindings.hsc
@@ -1,5 +1,4 @@
 {-# LANGUAGE CPP, ForeignFunctionInterface #-}
-
 module WinCBindings where
 
 #if defined(mingw32_HOST_OS)
diff --git a/testsuite/timeout/timeout.cabal b/testsuite/timeout/timeout.cabal
index 70ee3e512e..c44eadf02d 100644
--- a/testsuite/timeout/timeout.cabal
+++ b/testsuite/timeout/timeout.cabal
@@ -1,14 +1,11 @@
 Name: timeout
--- XXX Version number:
 Version: 1
-Copyright: XXX
+Copyright: GHC Team
 License: BSD3
--- XXX License-File: LICENSE
-Author: XXX
-Maintainer: XXX
-Synopsis: XXX
-Description:
-	XXX
+Author: GHC Team <cvs-ghc@haskell.org>
+Maintainer: GHC Team <cvs-ghc@haskell.org>
+Synopsis: timout utility
+Description: timeout utility
 Category: Development
 build-type: Simple
 cabal-version: >=1.2
diff --git a/testsuite/timeout/timeout.hs b/testsuite/timeout/timeout.hs
index 3a709b9f2c..3d27f56706 100644
--- a/testsuite/timeout/timeout.hs
+++ b/testsuite/timeout/timeout.hs
@@ -1,15 +1,16 @@
 {-# OPTIONS -cpp #-}
+module Main where
 
 import Prelude hiding (catch)
 
 import Control.Concurrent (forkIO, threadDelay)
 import Control.Concurrent.MVar (putMVar, takeMVar, newEmptyMVar)
+import Control.Monad
 import Control.Exception
 import Data.Maybe (isNothing)
 import System.Environment (getArgs)
 import System.Exit
 import System.IO (hPutStrLn, stderr)
-import Control.Monad
 
 #if !defined(mingw32_HOST_OS)
 import System.Posix hiding (killProcess)