fix reference to options from the commandline (#22163)

dothebart · web-flow · commit e51ddb04ea50 · 2025-12-08T17:03:16.000+01:00
* fix reference to options from the commandline

* create test datafiles so the tmpDirManager can flush it
diff --git a/js/client/modules/@arangodb/testsuites/gtest.js b/js/client/modules/@arangodb/testsuites/gtest.js
@@ -87,12 +87,12 @@ function gtestRunner (testfilename, name, opts, testoptions) {
     options.commandSwitches = options.commandSwitches.concat(testoptions);
   }
   let results = { failed: 0, [name]: {}};
-  let rootDir = fs.join(fs.getTempPath(), name);
-  let testResultJsonFile = fs.join(rootDir, 'testResults.json');
 
   const binary = locateGTest(testfilename);
   if (binary !== '') {
     let tmpMgr = new tmpDirMmgr('gtest', options);
+    let rootDir = fs.join(tmpMgr.tempDir, name);
+    let testResultJsonFile = fs.join(rootDir, 'testResults.json');
     let argv = [
       '--gtest_output=json:' + testResultJsonFile,
     ];
diff --git a/js/client/modules/@arangodb/testutils/dump.js b/js/client/modules/@arangodb/testutils/dump.js
@@ -140,7 +140,7 @@ class DumpRestoreHelper extends trs.runLocalInArangoshRunner {
         this.results.failed += this.results[key].failed;
       }
     });
-    this.doCleanup = this.serverOptions.cleanup && (this.results.failed === 0) && cleanup;
+    this.doCleanup = this.firstRunOptions.cleanup && (this.results.failed === 0) && cleanup;
     if (this.doCleanup) {
       if (this.im1 !== null) {
         this.im1.destructor(this.results.failed === 0);

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ class DumpRestoreHelper extends trs.runLocalInArangoshRunner {`
`140`	`140`	`this.results.failed += this.results[key].failed;`
`141`	`141`	`}`
`142`	`142`	`});`
`143`		`- this.doCleanup = this.serverOptions.cleanup && (this.results.failed === 0) && cleanup;`
	`143`	`+ this.doCleanup = this.firstRunOptions.cleanup && (this.results.failed === 0) && cleanup;`
`144`	`144`	`if (this.doCleanup) {`
`145`	`145`	`if (this.im1 !== null) {`
`146`	`146`	`this.im1.destructor(this.results.failed === 0);`