diff --git a/check_py_coverage.sh b/check_py_coverage.sh index bebeff6d..45df5913 100755 --- a/check_py_coverage.sh +++ b/check_py_coverage.sh @@ -49,6 +49,10 @@ cd $SCRIPT_DIR #coverage help run SRC_DIR=`(cd src && pwd)` +if [[ "$SRC_DIR" == "/c"* ]] +then + SRC_DIR="C:${SRC_DIR:2}" +fi # get display var DISPLAY_VAR=`(echo $DISPLAY)` diff --git a/developer_tools/rook.ini b/developer_tools/rook.ini index b13eaeef..8a5ac11f 100644 --- a/developer_tools/rook.ini +++ b/developer_tools/rook.ini @@ -1,4 +1,4 @@ [rook] add_non_default_run_types = qsub -testers_dir = HERON/src/Testers -test_dir = tests \ No newline at end of file +testers_dir = HERON/src/Testers, raven/scripts/TestHarness/testers +test_dir = tests diff --git a/tests/unit_tests/tests b/tests/unit_tests/tests index 4a340f4e..8bcaa970 100644 --- a/tests/unit_tests/tests +++ b/tests/unit_tests/tests @@ -1,46 +1,46 @@ [Tests] [./TestMinimalInput] - type = RavenPython - input = '-m unittest test_heron.TestMinimalInput' + type = Unittest + input = 'test_heron.TestMinimalInput' [../] [./TestExpandedInput1] - type = RavenPython - input = '-m unittest test_heron.TestExpandedInput1' + type = Unittest + input = 'test_heron.TestExpandedInput1' [../] [./TestExpandedInput2] - type = RavenPython - input = '-m unittest test_heron.TestExpandedInput2' + type = Unittest + input = 'test_heron.TestExpandedInput2' [../] [./TestNoComponentsNode] - type = RavenPython - input = '-m unittest test_heron.TestNoComponentsNode' + type = Unittest + input = 'test_heron.TestNoComponentsNode' [../] [./TestNoComponentNodes] - type = RavenPython - input = '-m unittest test_heron.TestNoComponentNodes' + type = Unittest + input = 'test_heron.TestNoComponentNodes' [../] [./TestMissingSubnodes] - type = RavenPython - input = '-m unittest test_heron.TestMissingSubnodes' + type = Unittest + input = 'test_heron.TestMissingSubnodes' [../] [./TestEmptyCompSetsFolder] - type = RavenPython - input = '-m unittest test_heron.TestEmptyCompSetsFolder' + type = Unittest + input = 'test_heron.TestEmptyCompSetsFolder' [../] [./TestCompSetsFolderWithBadJSON] - type = RavenPython - input = '-m unittest test_heron.TestCompSetsFolderWithBadJSON' + type = Unittest + input = 'test_heron.TestCompSetsFolderWithBadJSON' [../] [./TestCompSetsFolderMultFiles] - type = RavenPython - input = '-m unittest test_heron.TestCompSetsFolderMultFiles' + type = Unittest + input = 'test_heron.TestCompSetsFolderMultFiles' [../] []