fix return value handling by partial revert

dothebart · dothebart · commit 58f38dc4c5bb · 2023-10-24T17:07:13.000+02:00
diff --git a/simple/run-big-all-runs1.js b/simple/run-big-all-runs1.js
@@ -1,5 +1,5 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     outputCsv: true,
     big: true,
     runs: 1,
@@ -14,6 +14,7 @@ function main () {
     crudSearch: true,
     subqueryTests: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-big-all.js b/simple/run-big-all.js
@@ -1,5 +1,5 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     outputCsv: true,
     big: true,
 
@@ -13,6 +13,7 @@ function main () {
     crudSearch: true,
     subqueryTests: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-big-crud.js b/simple/run-big-crud.js
@@ -1,9 +1,10 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     outputCsv: true,
     big: true,
     crud: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-medium-all-runs1.js b/simple/run-medium-all-runs1.js
@@ -1,5 +1,5 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     outputCsv: true,
     medium: true,
     runs: 1,
@@ -14,6 +14,7 @@ function main () {
     crudSearch: true,
     subqueryTests: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-medium-all.js b/simple/run-medium-all.js
@@ -1,5 +1,5 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     outputCsv: true,
     medium: true,
 
@@ -13,6 +13,7 @@ function main () {
     crudSearch: true,
     subqueryTests: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-medium-oneshard-regular-collections.js b/simple/run-medium-oneshard-regular-collections.js
@@ -1,9 +1,10 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     medium: true,
     oneshardTests: true,
     numberOfShards: 5
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-medium-oneshard.js b/simple/run-medium-oneshard.js
@@ -1,8 +1,9 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     medium: true,
     oneshardTests: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-medium-subquery.js b/simple/run-medium-subquery.js
@@ -1,8 +1,9 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     medium: true,
     subqueryTests: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-all-junit.js b/simple/run-small-all-junit.js
@@ -1,5 +1,5 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     outputXml: true,
     xmlDirectory: "xml",
 
@@ -13,6 +13,7 @@ function main () {
     crud: true,
     crudSearch: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-all.js b/simple/run-small-all.js
@@ -1,5 +1,5 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     outputCsv: true,
     small: true,
 
@@ -12,6 +12,7 @@ function main () {
     crud: true,
     crudSearch: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-crud.js b/simple/run-small-crud.js
@@ -1,9 +1,10 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     small: true,
 
     crud: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-documents.js b/simple/run-small-documents.js
@@ -1,9 +1,10 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     small: true,
 
    documents: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-edges.js b/simple/run-small-edges.js
@@ -1,5 +1,5 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     outputCsv: true,
     small: true,
 
@@ -10,6 +10,7 @@ function main () {
     crud: false,
     crudSearch: false
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-oneshard-regular-collections.js b/simple/run-small-oneshard-regular-collections.js
@@ -1,10 +1,11 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     small: true,
 
     oneshardTests: true,
      numberOfShards: 5
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-oneshard.js b/simple/run-small-oneshard.js
@@ -1,8 +1,9 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     small: true,
      oneshardTests: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-satellite-graphs.js b/simple/run-small-satellite-graphs.js
@@ -1,8 +1,9 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     small: true,
     satelliteGraphTests: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-subquery.js b/simple/run-small-subquery.js
@@ -1,8 +1,9 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     small: true,
     subqueryTests: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-tiny-all.js b/simple/run-tiny-all.js
@@ -1,5 +1,5 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     outputCsv: true,
     tiny: true,
     small: false,
@@ -14,6 +14,7 @@ function main () {
     crudSearch: true,
     subqueryTests: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-tiny-crud-runs1.js b/simple/run-tiny-crud-runs1.js
@@ -1,10 +1,11 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     outputCsv: true,
     tiny: true,
     runs: 1,
     crud: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-tiny-crud.js b/simple/run-tiny-crud.js
@@ -1,9 +1,10 @@
 function main () {
-  return require("./simple/test").test({
+  require("./simple/test").test({
     outputCsv: true,
     tiny: true,
     crud: true
   });
+  return global.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/test.js b/simple/test.js
@@ -264,8 +264,7 @@ exports.test = function (global) {
       return { results: out, errors };
     };
 
-    run(tests, options);
-    return global.returnValue;
+    return run(tests, options);
   }; // testrunner
 
   const toJUnit = function (out, prefix, postfix) {
