acvp: fix tests It happened that it used to be possible to run `acvptool` with `-json` and not need a config file. That stopped working as of 02397c7c97 but the test runner needs to be updated accordingly. Change-Id: I54cf0fc7420d18749e93c3d85201ba24d0a59e15 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57465 Commit-Queue: Adam Langley <agl@google.com> Auto-Submit: Adam Langley <agl@google.com> Reviewed-by: David Benjamin <davidben@google.com>
diff --git a/util/fipstools/acvp/acvptool/test/check_expected.go b/util/fipstools/acvp/acvptool/test/check_expected.go index ccc8038..2f6c5d9 100644 --- a/util/fipstools/acvp/acvptool/test/check_expected.go +++ b/util/fipstools/acvp/acvptool/test/check_expected.go
@@ -42,6 +42,7 @@ wrapperPath string inPath string expectedPath string + configPath string } func main() { @@ -85,6 +86,15 @@ log.Fatal(err) } + configFile, err := os.CreateTemp("", "boringssl-check_expected-config-") + if err != nil { + log.Fatalf("Failed to create temp file for config: %s", err) + } + defer os.Remove(configFile.Name()) + if _, err := configFile.WriteString("{}\n"); err != nil { + log.Fatalf("Failed to write config file: %s", err) + } + work := make(chan invocation, runtime.NumCPU()) var numFailed uint32 @@ -104,6 +114,7 @@ wrapperPath: wrapper, inPath: test.In, expectedPath: test.Out, + configPath: configFile.Name(), } } @@ -149,7 +160,7 @@ return fmt.Errorf("Failed to decompress %q: %s", test.inPath, err) } - cmd := exec.Command(test.toolPath, "-wrapper", test.wrapperPath, "-json", tempFile.Name()) + cmd := exec.Command(test.toolPath, "-wrapper", test.wrapperPath, "-json", tempFile.Name(), "-config", test.configPath) result, err := cmd.CombinedOutput() if err != nil { os.Stderr.Write(result)