Merge branch 'main' of https://github.com/model-checking/kani-vscode-…

…extension into update-readme-with-coverage
model-checking · Oct 17, 2023 · d30daf8 · d30daf8
2 parents ccc341f + f73b940
commit d30daf8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
@@ -20,7 +20,6 @@ jobs:
 
       - name: Check TS linting
         run: |
-          npm install -g [email protected]
           npm install
           npm run lint
 

diff --git a/src/constants.ts b/src/constants.ts
@@ -17,5 +17,5 @@ export namespace KaniArguments {
 	export const testsFlag: string = `--tests`;
 	export const outputFormatFlag: string = `--output-format`;
 	export const unstableFormatFlag: string = `--enable-unstable`;
-	export const stubbingFlag: string = `--enable-stubbing`;
+	export const stubbingFlag: string = `-Z=stubbing`;
 }
diff --git a/src/model/kaniCommandCreate.ts b/src/model/kaniCommandCreate.ts
@@ -72,19 +72,13 @@ function createCommand(
 	testFlag: boolean = false,
 	stubbing_args?: boolean,
 ): string {
-	let harnessCommand = '';
-	if (!testFlag) {
-		if (stubbing_args === undefined || !stubbing_args) {
-			harnessCommand = `${KaniConstants.CargoKaniExecutableName} ${KaniArguments.packageFlag} ${packageName} ${KaniArguments.harnessFlag} ${harnessName}`;
-		} else {
-			harnessCommand = `${KaniConstants.CargoKaniExecutableName} ${KaniArguments.unstableFormatFlag} ${KaniArguments.stubbingFlag} ${KaniArguments.packageFlag} ${packageName} ${KaniArguments.harnessFlag} ${harnessName}`;
-		}
-	} else {
-		if (stubbing_args === undefined || !stubbing_args) {
-			harnessCommand = `${KaniConstants.CargoKaniExecutableName} ${KaniArguments.testsFlag} ${KaniArguments.packageFlag} ${packageName}  ${KaniArguments.harnessFlag} ${harnessName}`;
-		} else {
-			harnessCommand = `${KaniConstants.CargoKaniExecutableName} ${KaniArguments.testsFlag} ${KaniArguments.unstableFormatFlag} ${KaniArguments.stubbingFlag} ${KaniArguments.packageFlag} ${packageName} ${KaniArguments.harnessFlag} ${harnessName}`;
-		}
+	let harnessCommand = `${KaniConstants.CargoKaniExecutableName} ${KaniArguments.packageFlag} ${packageName} ${KaniArguments.harnessFlag} ${harnessName}`;
+	if (testFlag) {
+		harnessCommand = `${harnessCommand} ${KaniArguments.testsFlag}`;
+	}
+
+	if (stubbing_args !== undefined && stubbing_args) {
+		harnessCommand = `${harnessCommand} ${KaniArguments.stubbingFlag}`;
 	}
 
 	return harnessCommand;