Feature/raw cargo opts

azure/stages.yml

@@ -10,6 +10,7 @@ parameters:
   check_all_features: true
   nightly_feature: ''
   test_features: ''
+  test_args_raw: '--' # Defaults to a separator
 
 stages:
  # the format here is so that we can have _two_ instances of this whole
@@ -58,6 +59,7 @@ stages:
          single_threaded: ${{ parameters.single_threaded }}
          nightly_feature: ${{ parameters.nightly_feature }}
          features: ${{ parameters.test_features }}
+         raw_opts: ${{ parameters.test_args_raw }}
  - stage: ${{ format('{0}style', parameters.prefix) }}
    ${{ if ne(parameters.prefix, '') }}:
      displayName: ${{ format('Style linting ({0})', parameters.prefix) }}

azure/test.yml

@@ -7,6 +7,7 @@ parameters:
   test_ignored: false
   single_threaded: false
   features: '' # empty feature list is == default
+  raw_opts: '--' # Defaults to the separator between cargo opts and libtest opts
 
 jobs:
 - job: ${{ parameters.name }}
@@ -24,33 +25,33 @@ jobs:
           vmImage: macOS-10.14
         Windows:
           vmImage: windows-2019
-  ${{ if ne('true', parameters.cross) }}:
-    variables:
+  variables:
+    ${{ if ne('true', parameters.cross) }}:
       vmImage: ubuntu-16.04
+    cargo_opts: ''
+    libtest_opts: ''
   pool:
     vmImage: $(vmImage)
   steps:
   - template: _setup.yml
     parameters:
       rust: ${{ parameters.rust }}
       setup: ${{ parameters.setup }}
-  - ${{ if ne('true', parameters.single_threaded) }}:
-    - script: cargo test --all --features "${{ parameters.features }}"
-      displayName: Run tests
-      env:
-        ${{ insert }}: ${{ parameters.envs }}
+  # Cargo options go here
+  - bash: echo '##vso[task.setvariable variable=cargo_opts]$(cargo_opts) --all'
+  - ${{ if eq(true, parameters.features)}}:
+    - bash: echo '##vso[task.setvariable variable=cargo_opts]$(cargo_opts) --features "${{ parameters.features }}"'
+  # Libtest options go here
   - ${{ if eq('true', parameters.single_threaded) }}:
-    - script: cargo test --all --features "${{ parameters.features }}" -- --test-threads=1
-      displayName: Run tests (single-threaded)
-      env:
-        ${{ insert }}: ${{ parameters.envs }}
-  - ${{ if and(eq('true', parameters.test_ignored), ne('true', parameters.single_threaded)) }}:
-    - script: cargo test --all --features "${{ parameters.features }}" -- --ignored
+    - bash: echo '##vso[task.setvariable variable=libtest_opts]$(libtest_opts) --test-threads=1'
+  # Run tests with the given options
+  - bash: cargo test $(cargo_opts) ${{ parameters.raw_opts }} $(libtest_opts)
+    displayName: Run tests
+    env:
+      ${{ insert }}: ${{ parameters.envs }}
+  - ${{ if eq('true', parameters.test_ignored)}}:
+    - bash: cargo test $(cargo_opts) ${{ parameters.raw_opts }} $(libtest_opts) --ignored
       displayName: Run ignored tests
       env:
         ${{ insert }}: ${{ parameters.envs }}
-  - ${{ if and(eq('true', parameters.test_ignored), eq('true', parameters.single_threaded)) }}:
-    - script: cargo test --all --features "${{ parameters.features }}" -- --ignored --test-threads=1
-      displayName: Run ignored tests (single-threaded)
-      env:
-        ${{ insert }}: ${{ parameters.envs }}
+

azure/tests.yml

@@ -5,6 +5,7 @@ parameters:
   single_threaded: false
   nightly_feature: ''
   features: ''
+  raw_opts: '--'
 
 jobs:
  - template: test.yml
@@ -16,6 +17,7 @@ jobs:
      test_ignored: ${{ parameters.test_ignored }}
      single_threaded: ${{ parameters.single_threaded }}
      features: ${{ parameters.features }}
+     raw_opts: ${{ parameters.raw_opts }}
  - template: test.yml
    parameters:
      name: cargo_test_beta
@@ -25,6 +27,7 @@ jobs:
      test_ignored: ${{ parameters.test_ignored }}
      single_threaded: ${{ parameters.single_threaded }}
      features: ${{ parameters.features }}
+     raw_opts: ${{ parameters.raw_opts }}
  - template: test.yml
    parameters:
      name: cargo_test_nightly
@@ -35,3 +38,4 @@ jobs:
      test_ignored: ${{ parameters.test_ignored }}
      single_threaded: ${{ parameters.single_threaded }}
      features: "${{ parameters.features }},${{ parameters.nightly_feature }}"
+     raw_opts: ${{ parameters.raw_opts }}