Merge pull request #51 from mathworks/startupopts

Initial startup-options support

Author: sameagen-MW

.circleci/test-deploy.yml

@@ -137,6 +137,7 @@ jobs:
     # Integ tests for matlab/run-tests
       - matlab/run-tests:
           source-folder: src
+          startup-options: -logfile console.log
       - matlab/run-tests:
           test-results-junit: test-results/matlab/results.xml
           code-coverage-cobertura: code-coverage/coverage.xml
@@ -152,6 +153,15 @@ jobs:
           test-results-junit: test-results/matlab/filterdtagresult.xml
           select-by-tag: FILTERED
 
+      - run:
+          name: Verify tests ran with startup options
+          command: |
+            set -e
+            grep mytest console.log
+            grep TaggedTest console.log
+            grep filtertest console.log
+            rm console.log
+          shell: bash
       - run:
           name: Verify test results file was created
           command: |
@@ -364,16 +374,22 @@ jobs:
             rm buildlog.txt
           shell: bash
       # run build with default tasks
-      - matlab/run-build
+      - matlab/run-build:
+          startup-options: -logfile console.log
       - run:
           name: Verify that correct tasks appear in buildlog.txt
           command: |
             set -e
             grep "building" buildlog.txt
+            grep "build" console.log
             grep "testing" buildlog.txt
+            grep "test" console.log
             ! grep "deploying" buildlog.txt
+            ! grep "deploy" console.log
             ! grep "checking" buildlog.txt
+            ! grep "check" console.log
             rm buildlog.txt
+            rm console.log
           shell: bash
 
 workflows:

src/commands/run-build.yml

@@ -10,6 +10,12 @@ parameters:
       in the plan returned by buildfile.m as well as all the tasks on which they depend.
     type: string
     default: ""
+  startup-options:
+    description: >
+      MATLAB startup options. If you specify more than one option, use a space to
+      separate the options.
+    type: string
+    default: ""
   no-output-timeout:
     description: >
       Elapsed time the command can run without output. The string is a decimal with unit suffix,
@@ -23,6 +29,7 @@ steps:
       name: Run MATLAB build
       environment:
         PARAM_TASKS: <<parameters.tasks>>
+        PARAM_ARGS: <<parameters.startup-options>>
       command: <<include(scripts/run-build.sh)>>
       shell: bash
       no_output_timeout: <<parameters.no-output-timeout>>

src/commands/run-tests.yml

@@ -96,6 +96,12 @@ parameters:
       Maximum verbosity level for logged diagnostics included for the test run, specified as 'None', 'Terse', 'Concise', 'Detailed', or 'Verbose'.
     type: string
     default: ''
+  startup-options:
+    description: >
+      MATLAB startup options. If you specify more than one option, use a space to
+      separate the options.
+    type: string
+    default: ""
 
 steps:
   - run:
@@ -116,6 +122,7 @@ steps:
         PARAM_USE_PARALLEL: <<parameters.use-parallel>>
         PARAM_OUTPUT_DETAIL: <<parameters.output-detail>>
         PARAM_LOGGING_LEVEL: <<parameters.logging-level>>
+        PARAM_ARGS: <<parameters.startup-options>>
       command: <<include(scripts/run-tests.sh)>>
       shell: bash
       no_output_timeout: <<parameters.no-output-timeout>>

src/scripts/run-build.sh

@@ -36,4 +36,4 @@ $buildCommand
 EOF
 
 # run MATLAB command
-"${tmpdir}/bin/run-matlab-command$binext" "cd('${scriptdir//\'/\'\'}');$script"
+"${tmpdir}/bin/run-matlab-command$binext" "cd('${scriptdir//\'/\'\'}');$script" $PARAM_ARGS

src/scripts/run-tests.sh

@@ -47,4 +47,4 @@ fi
     disp('Running MATLAB script with contents:');\
     disp(testScript.Contents);\
     fprintf('__________\n\n');\
-    run(testScript);"
+    run(testScript);" $PARAM_ARGS