fix: make sure teardown is called only once after all the benchmarks ran

Author: adriencaccia

packages/benchmark.js-plugin/src/index.ts

@@ -200,7 +200,7 @@ async function runBenchmarks({
     }
     console.log(`    ✔ Measured ${uri}`);
     benchmarkCompletedListeners.forEach((listener) => listener());
-    teardownCore();
   }
+  teardownCore();
   console.log(`[CodSpeed] Done running ${benches.length} benches.`);
 }

packages/benchmark.js-plugin/tests/index.integ.test.ts

@@ -236,4 +236,18 @@ describe("Benchmark.Suite", () => {
       "packages/benchmark.js-plugin/tests/registerOtherBenchmarks.ts::thesuite::RegExp"
     );
   });
+  it("should call setupCore and teardownCore only once after run()", async () => {
+    mockCore.Measurement.isInstrumented.mockReturnValue(true);
+    const suite = withCodSpeed(new Benchmark.Suite("thesuite"));
+    registerBenchmarks(suite);
+    registerOtherBenchmarks(suite);
+
+    expect(mockCore.setupCore).not.toHaveBeenCalled();
+    expect(mockCore.teardownCore).not.toHaveBeenCalled();
+
+    await suite.run({ maxTime: 0.1, initCount: 1 });
+
+    expect(mockCore.setupCore).toHaveBeenCalledTimes(1);
+    expect(mockCore.teardownCore).toHaveBeenCalledTimes(1);
+  });
 });

packages/tinybench-plugin/src/index.ts

@@ -44,8 +44,8 @@ export function withCodSpeed(bench: Bench): Bench {
   const rootCallingFile = getCallingFile();
 
   bench.run = async () => {
-    setupCore();
     console.log(`[CodSpeed] running with @codspeed/tinybench v${__VERSION__}`);
+    setupCore();
     for (const task of bench.tasks) {
       // run before hooks
       if (task.opts.beforeAll != null) {
@@ -77,10 +77,10 @@ export function withCodSpeed(bench: Bench): Bench {
       // print results
       console.log(`    ✔ Measured ${uri}`);
     }
+    teardownCore();
     console.log(`[CodSpeed] Done running ${bench.tasks.length} benches.`);
     return bench.tasks;
   };
-  teardownCore();
   return bench;
 }
 

packages/tinybench-plugin/tests/index.integ.test.ts

@@ -158,4 +158,23 @@ describe("Benchmark.Suite", () => {
     expect(afterEach).toHaveBeenCalledTimes(2);
     expect(afterAll).toHaveBeenCalledTimes(2);
   });
+
+  it("should call setupCore and teardownCore only once after run()", async () => {
+    mockCore.Measurement.isInstrumented.mockReturnValue(true);
+    const bench = withCodSpeed(new Bench())
+      .add("RegExp", function () {
+        /o/.test("Hello World!");
+      })
+      .add("RegExp2", () => {
+        /o/.test("Hello World!");
+      });
+
+    expect(mockCore.setupCore).not.toHaveBeenCalled();
+    expect(mockCore.teardownCore).not.toHaveBeenCalled();
+
+    await bench.run();
+
+    expect(mockCore.setupCore).toHaveBeenCalledTimes(1);
+    expect(mockCore.teardownCore).toHaveBeenCalledTimes(1);
+  });
 });