diff --git a/TestVectorsAwsCryptographicMaterialProviders/dafny/TestVectorsAwsCryptographicMaterialProviders/test/RunMain.dfy b/TestVectorsAwsCryptographicMaterialProviders/dafny/TestVectorsAwsCryptographicMaterialProviders/test/RunMain.dfy index 7620fa302..b93d9499c 100644 --- a/TestVectorsAwsCryptographicMaterialProviders/dafny/TestVectorsAwsCryptographicMaterialProviders/test/RunMain.dfy +++ b/TestVectorsAwsCryptographicMaterialProviders/dafny/TestVectorsAwsCryptographicMaterialProviders/test/RunMain.dfy @@ -17,8 +17,15 @@ module {:extern} TestWrappedMaterialProvidersMain { // Runtime should define an extern to return the expected test execution directory. method {:extern} GetTestVectorExecutionDirectory() returns (res: string) - // This MUST go before TestEncryptManifest - method {:test} TestGenerateEncryptManifest() { + // This is done to maintain order in systems that run tests in parallel + // such as Rust. + method {:test} RunManifestTests() { + TestGenerateEncryptManifest(); + TestEncryptManifest(); + TestDecryptManifest(); + } + + method TestGenerateEncryptManifest() { var directory := GetTestVectorExecutionDirectory(); var result := CompleteVectors.WriteStuff( EncryptManifest( @@ -30,8 +37,7 @@ module {:extern} TestWrappedMaterialProvidersMain { expect result.Success?; } - // This MUST go before TestDecryptManifest - method {:test} TestEncryptManifest() { + method TestEncryptManifest() { var directory := GetTestVectorExecutionDirectory(); var result := TestManifests.StartEncrypt( Encrypt( @@ -45,7 +51,7 @@ module {:extern} TestWrappedMaterialProvidersMain { expect result.Success?; } - method {:test} TestDecryptManifest() { + method TestDecryptManifest() { var directory := GetTestVectorExecutionDirectory(); var result := TestManifests.StartDecrypt( Decrypt(