[commit: ghc] wip/nfs-locking: Move Selftest and Test rules into Rules directory. (d81e041)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/d81e041691644e1f99a84691ac0d0fb94c96b263/ghc

>---------------------------------------------------------------

commit d81e041691644e1f99a84691ac0d0fb94c96b263
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Feb 14 23:02:46 2016 +0000

    Move Selftest and Test rules into Rules directory.


>---------------------------------------------------------------

d81e041691644e1f99a84691ac0d0fb94c96b263
 shaking-up-ghc.cabal        |  4 ++--
 src/Main.hs                 | 10 +++++-----
 src/{ => Rules}/Selftest.hs |  2 +-
 src/{ => Rules}/Test.hs     |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/shaking-up-ghc.cabal b/shaking-up-ghc.cabal
index 2ab8ee7..6435d30 100644
--- a/shaking-up-ghc.cabal
+++ b/shaking-up-ghc.cabal
@@ -63,10 +63,11 @@ executable ghc-shake
                        , Rules.Program
                        , Rules.Register
                        , Rules.Resources
+                       , Rules.Selftest
                        , Rules.Setup
+                       , Rules.Test
                        , Rules.Wrappers.Ghc
                        , Rules.Wrappers.GhcPkg
-                       , Selftest
                        , Settings
                        , Settings.Args
                        , Settings.Builders.Alex
@@ -106,7 +107,6 @@ executable ghc-shake
                        , Settings.Ways
                        , Stage
                        , Target
-                       , Test
                        , Way
 
     default-language:    Haskell2010
diff --git a/src/Main.hs b/src/Main.hs
index e028597..5de50ad 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -8,8 +8,8 @@ import qualified Environment
 import qualified Rules
 import qualified Rules.Clean
 import qualified Rules.Oracles
-import qualified Selftest
-import qualified Test
+import qualified Rules.Selftest
+import qualified Rules.Test
 
 main :: IO ()
 main = shakeArgsWith options CmdLineFlag.cmdFlags $ \cmdLineFlags targets -> do
@@ -23,10 +23,10 @@ main = shakeArgsWith options CmdLineFlag.cmdFlags $ \cmdLineFlags targets -> do
     rules = mconcat
         [ Rules.Clean.cleanRules
         , Rules.Oracles.oracleRules
+        , Rules.Selftest.selftestRules
+        , Rules.Test.testRules
         , Rules.buildRules
-        , Rules.topLevelTargets
-        , Selftest.selftestRules
-        , Test.testRules ]
+        , Rules.topLevelTargets ]
     options = shakeOptions
         { shakeChange   = ChangeModtimeAndDigest
         , shakeFiles    = Base.shakeFilesPath
diff --git a/src/Selftest.hs b/src/Rules/Selftest.hs
similarity index 94%
rename from src/Selftest.hs
rename to src/Rules/Selftest.hs
index 4800ca8..a3cc089 100644
--- a/src/Selftest.hs
+++ b/src/Rules/Selftest.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-module Selftest (selftestRules) where
+module Rules.Selftest (selftestRules) where
 
 import Development.Shake
 import Settings.Builders.Ar (chunksOfSize)
diff --git a/src/Test.hs b/src/Rules/Test.hs
similarity index 98%
rename from src/Test.hs
rename to src/Rules/Test.hs
index 3ef0d1d..0448b2b 100644
--- a/src/Test.hs
+++ b/src/Rules/Test.hs
@@ -1,4 +1,4 @@
-module Test (testRules) where
+module Rules.Test (testRules) where
 
 import Base
 import Builder