Update the bytestring tests for the bytestring package

testsuite/tests/ghc-regress/lib/Data.ByteString/all.T

-test('bytestring001', reqlib('QuickCheck'), compile_and_run, ['-package QuickCheck'])
-test('bytestring002', normal, compile_and_run, [''])
-test('bytestring003', normal, compile_and_run, [''])
-test('bytestring004', reqlib('QuickCheck'), compile_and_run, ['-package QuickCheck'])
-test('bytestring005', reqlib('QuickCheck'), compile_and_run, ['-package QuickCheck'])
+test('bytestring001', reqlib('QuickCheck'), compile_and_run, ['-package bytestring -package QuickCheck'])
+test('bytestring002', normal, compile_and_run, ['-package bytestring'])
+test('bytestring003', normal, compile_and_run, ['-package bytestring'])
+test('bytestring004', reqlib('QuickCheck'), compile_and_run, ['-package bytestring -package QuickCheck'])
+test('bytestring005', reqlib('QuickCheck'), compile_and_run, ['-package bytestring -package QuickCheck'])

testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring001.hs

@@ -32,12 +32,12 @@ import qualified Data.ByteString.Lazy as L
 import Data.ByteString.Fusion
 import qualified Data.ByteString      as P
 import qualified Data.ByteString.Lazy as L
-import qualified Data.ByteString.Base as L (LazyByteString(..))
+import qualified Data.ByteString.Lazy.Internal as L
 
 import qualified Data.ByteString.Char8      as PC
 import qualified Data.ByteString.Lazy.Char8 as LC
 import qualified Data.ByteString       as P
-import qualified Data.ByteString.Base  as P
+import qualified Data.ByteString.Internal  as P
 import qualified Data.ByteString.Char8 as C
 import qualified Data.ByteString.Lazy.Char8 as D
 import Data.ByteString.Fusion

testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring003.hs

@@ -6,7 +6,8 @@
 
 import System.IO
 import qualified Data.ByteString as B
-import Data.ByteString.Base (ByteString,unsafeTail,unsafeIndex)
+import Data.ByteString (ByteString)
+import Data.ByteString.Unsafe (unsafeTail,unsafeIndex)
 import Data.Char    -- seems to help!
 
 #define STRICT2(f) f a b | a `seq` b `seq` False = undefined

testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring004.hs

@@ -28,7 +28,7 @@ import Foreign.Ptr
 
 import Data.ByteString.Lazy (ByteString(..), pack , unpack)
 import qualified Data.ByteString.Lazy as L
-import qualified Data.ByteString.Base as L (LazyByteString(..))
+import qualified Data.ByteString.Lazy.Internal as L
 
 import Data.ByteString.Fusion
 import qualified Data.ByteString      as P
@@ -37,7 +37,7 @@ import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString.Char8      as PC
 import qualified Data.ByteString.Lazy.Char8 as LC
 import qualified Data.ByteString       as P
-import qualified Data.ByteString.Base  as P
+import qualified Data.ByteString.Internal as P
 import qualified Data.ByteString.Char8 as C
 import qualified Data.ByteString.Lazy.Char8 as D
 import Data.ByteString.Fusion

testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring005.hs

@@ -27,16 +27,17 @@ import Foreign.Ptr
 
 import Data.ByteString.Lazy (ByteString(..), pack , unpack)
 import qualified Data.ByteString.Lazy as L
-import qualified Data.ByteString.Base as L (LazyByteString(..))
+import qualified Data.ByteString.Lazy.Internal as L
 
 import Data.ByteString.Fusion
 import qualified Data.ByteString      as P
+import qualified Data.ByteString.Unsafe as P
 import qualified Data.ByteString.Lazy as L
 
 import qualified Data.ByteString.Char8      as PC
 import qualified Data.ByteString.Lazy.Char8 as LC
 import qualified Data.ByteString       as P
-import qualified Data.ByteString.Base  as P
+import qualified Data.ByteString.Internal  as P
 import qualified Data.ByteString.Char8 as C
 import qualified Data.ByteString.Lazy.Char8 as D
 import Data.ByteString.Fusion