haskell-cnc 0.1 → 0.1.1
raw patch · 3 files changed
+15/−6 lines, 3 filessetup-changednew-component:exe:haskell-cnc-runTestsPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- Setup.hs +1/−1
- haskell-cnc.cabal +7/−4
- runAllTests.hs +7/−1
Setup.hs view
@@ -19,6 +19,6 @@ defaultMainWithHooks (simpleUserHooks {runTests = myTests}) myTests :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO () -myTests _ _ _ _ = do code <- system "./dist/build/runAllTests/runAllTests" +myTests _ _ _ _ = do code <- system "./dist/build/haskell-cnc-runTests/haskell-cnc-runTests" exitWith code
haskell-cnc.cabal view
@@ -1,5 +1,5 @@ Name: haskell-cnc-Version: 0.1+Version: 0.1.1 License: LGPL License-file: LICENSE Stability: Beta@@ -23,7 +23,7 @@ -- HSH, gnuplot -- , judy>=0.2.2 - exposed-modules: Intel.Cnc Intel.CncPure+ exposed-modules: Intel.Cnc Intel.CncPure Intel.CncUtil -- Various alternative schedulers: Intel.Cnc3 Intel.Cnc5 Intel.Cnc6 Intel.Cnc8 extensions: CPP, @@ -35,19 +35,22 @@ GHC-Options: -O2 -- cpp-options: -DUSE_GMAP -- -Wall + -- Unfortunately these go in the include/ subdirectory once cabal installs the package. install-includes: ntimes ntimes_minmedmax README.txt haskell_cnc.h Makefile install_environment_vars.sh default_opt_settings.sh runcnc run_all_examples.sh scaling.hs examples/hello_world.hs examples/mandel.hs examples/primes.hs examples/primes2.hs examples/sched_tree.hs examples/threadring_onestep.hs examples/threadring.hs examples/embarrassingly_par.hs examples/fib.hs examples/nbody.hs- Intel/Cnc.Header.hs Intel/shared_5_6.hs Intel/CncUtil.hs+ Intel/Cnc.Header.hs Intel/shared_5_6.hs + --Intel/CncUtil.hs+ --Intel/Cnc.hs Intel/CncPure.hs Intel/Cnc3.hs Intel/Cnc5.hs Intel/Cnc6.hs Intel/Cnc8.hs -- This seems to be completly ignored by cabal currently: -- Test testit -- type: library-1 -- test-is: Intel.Cnc -Executable runAllTests+Executable haskell-cnc-runTests Main-is: runAllTests.hs Build-Depends: base >= 3 && < 5, directory, process other-modules: Intel.Cnc Intel.CncPure
runAllTests.hs view
@@ -14,7 +14,7 @@ cd <- getCurrentDirectory putStrLn$ "Running Unit tests in directory: " ++ show cd-+ putStrLn$ "\n================================================================================" putStrLn$ "Running "++ show (testCaseCount Intel.CncUtil.tests) ++" tests from Intel.CncUtil" putStrLn$ "================================================================================\n"@@ -37,6 +37,12 @@ putStrLn$ "\n================================================================================" putStrLn$ "Finally running system tests in all configurations (example programs):" putStrLn$ "================================================================================\n"++ b <- doesFileExist "run_all_examples.sh"+ if not b+ then error$ "Uh oh, the script run_all_examples.sh doesn't exist in this directory.\n"+++ " If cabal installed the package you may find it in your ~/.cabal/lib directory."+ else return () -- I have problems with cabal sdist not preserving executable flags. system "chmod +x ./runcnc"