summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2018-11-25 19:14:03 +0000
committerjao <jao@gnu.org>2018-11-25 19:14:03 +0000
commite04d4c6eb84d5adfe62b6a538e7c4008974424b2 (patch)
treec286e983bbd9902375ebce9683592109fb244595
parentf86bbb8ca5d3ba0d18e333cbe6cb57cc17e3ae07 (diff)
downloadxmobar-e04d4c6eb84d5adfe62b6a538e7c4008974424b2.tar.gz
xmobar-e04d4c6eb84d5adfe62b6a538e7c4008974424b2.tar.bz2
Test namespaces inside Xmobar
-rw-r--r--test/Xmobar/Plugins/Monitors/AlsaSpec.hs (renamed from test/Plugins/Monitors/AlsaSpec.hs)5
-rw-r--r--test/Xmobar/Plugins/Monitors/CommonSpec.hs (renamed from test/Plugins/Monitors/CommonSpec.hs)2
-rw-r--r--xmobar.cabal11
3 files changed, 9 insertions, 9 deletions
diff --git a/test/Plugins/Monitors/AlsaSpec.hs b/test/Xmobar/Plugins/Monitors/AlsaSpec.hs
index e775900..53c720f 100644
--- a/test/Plugins/Monitors/AlsaSpec.hs
+++ b/test/Xmobar/Plugins/Monitors/AlsaSpec.hs
@@ -1,5 +1,5 @@
{-# OPTIONS_GHC -Wall #-}
-module Plugins.Monitors.AlsaSpec
+module Xmobar.Plugins.Monitors.AlsaSpec
( main
, spec
) where
@@ -7,7 +7,6 @@ module Plugins.Monitors.AlsaSpec
import Control.Concurrent
import Control.Concurrent.Async
import Control.Monad
-import Xmobar.Plugins.Monitors.Alsa
import System.FilePath
import System.IO
import System.IO.Temp
@@ -15,6 +14,8 @@ import System.Posix.Files
import System.Process
import Test.Hspec
+import Xmobar.Plugins.Monitors.Alsa
+
main :: IO ()
main = hspec spec
diff --git a/test/Plugins/Monitors/CommonSpec.hs b/test/Xmobar/Plugins/Monitors/CommonSpec.hs
index ee1a5bc..84cfbf3 100644
--- a/test/Plugins/Monitors/CommonSpec.hs
+++ b/test/Xmobar/Plugins/Monitors/CommonSpec.hs
@@ -1,4 +1,4 @@
-module Plugins.Monitors.CommonSpec
+module Xmobar.Plugins.Monitors.CommonSpec
( main
, spec
) where
diff --git a/xmobar.cabal b/xmobar.cabal
index 8fd836a..582af4c 100644
--- a/xmobar.cabal
+++ b/xmobar.cabal
@@ -300,7 +300,9 @@ test-suite XmobarTest
hspec == 2.*,
xmobar
- other-modules: Plugins.Monitors.CommonSpec
+ other-modules: Xmobar.Plugins.Monitors.CommonSpec
+ Xmobar.Plugins.Monitors.Common
+ Xmobar.Utils
if flag(with_alsa) || flag(all_extensions)
build-depends: alsa-mixer > 0.2.0.2,
@@ -308,9 +310,6 @@ test-suite XmobarTest
process >= 1.4.3.0
other-modules: Xmobar.Plugins.Monitors.Volume
Xmobar.Plugins.Monitors.Alsa
- Plugins.Monitors.AlsaSpec
- Xmobar.Run.Commands
- Xmobar.Plugins.Monitors.Common
- Xmobar.System.Signal
- Xmobar.Utils
+ Xmobar.Plugins.Monitors.AlsaSpec
+
cpp-options: -DALSA