Fixes for mctest windows nexus: Should now function with .h5 output

.github/workflows/mcstas-conda-basictest.yml

@@ -200,7 +200,7 @@ jobs:
            set -x
            if [ "$RUNNER_OS" == "Windows" ];
            then
-             export SUFFIX=".bat --permissive"
+             export SUFFIX=".bat"
            else
             export SUFFIX=""
            fi

.github/workflows/mcstas-conda-testsuite.yml

@@ -94,7 +94,7 @@ jobs:
            export MCTEST_EXECUTABLE="mctest"
            if [ "$RUNNER_OS" == "Windows" ];
            then
-             export MCTEST_EXECUTABLE="mctest.bat --permissive"
+             export MCTEST_EXECUTABLE="mctest.bat"
            fi
            # Workaround for warning about "too long" tmpdir name on macOS/openmpi
            if [ "$RUNNER_OS" == "macOS" ];

.github/workflows/mcxtrace-conda-testsuite.yml

@@ -94,7 +94,7 @@ jobs:
            export MXTEST_EXECUTABLE="mxtest"
            if [ "$RUNNER_OS" == "Windows" ];
            then
-             export MXTEST_EXECUTABLE="mxtest.bat --permissive"
+             export MXTEST_EXECUTABLE="mxtest.bat"
            fi
            # Workaround for warning about "too long" tmpdir name on macOS/openmpi
            if [ "$RUNNER_OS" == "macOS" ];

devel/bin/mccode-create-conda-yml

@@ -41,7 +41,7 @@ def create_deplist( cfg ):
         if cfg.is_unix:
             deps += ['rsync']
         if cfg.is_win:
-            deps += ['m2-which','m2-sed','m2-gzip']
+            deps += ['m2-which','m2-sed','m2-gzip','m2-coreutils']
     if cfg.include_toplevel_extras:
         deps += ['gsl','libnexus','nexpy','cif2hkl','mcpl','mcpl-extra']
         if cfg.is_mcstas:

meta-pkgs/windows/environment.yml

@@ -10,6 +10,7 @@ dependencies:
   - m2-sed
   - m2-grep
   - m2-gzip
+  - m2-coreutils
   - m2w64-gcc
   - m2w64-gsl
   - msmpi

meta-pkgs/windows/mcstas-environment.yml

@@ -9,6 +9,7 @@ dependencies:
   - m2-which
   - m2-sed
   - m2-grep
+  - m2-coreutils
   - mcstas
   - gsl
   - msmpi

meta-pkgs/windows/mcxtrace-environment.yml

@@ -9,6 +9,7 @@ dependencies:
   - m2-which
   - m2-sed
   - m2-grep
+  - m2-coreutils
   - mcxtrace
   - gsl
   - msmpi

tools/Python/mctest/mctest.py

@@ -358,7 +358,7 @@ def mccode_test(branchdir, testdir, limitinstrs=None, instrfilter=None, version=
         else:
             metalog = LineLogger()
             resfile = join(testdir,test.instrname,"run_stdout_%d.txt" % (test.testnb))
-            cmd = r"grep %s_I= %s | head -1 | cut -f2- -d= | cut -f1 -d\ " %(test.detector, resfile)
+            cmd = r"grep %s_I= %s | head -1 | cut -f2 -d= | cut -f1 -d' '" %(test.detector, resfile)
             utils.run_subtool_to_completion(cmd, stdout_cb=metalog.logline)
             try:
                 test.testval=float(metalog.lst[0])