diff --git a/api.php b/api.php index 8cc400aea32035126dec9da633cc3b78e7109895..4be47da8b79c7deb0a7b158bffe76e886685b308 100644 --- a/api.php +++ b/api.php @@ -630,6 +630,7 @@ foreach ($testCases as $test) { } else { + # Note showTestRunnerDebugOutput this is stored in calling service (part of response) $showTestRunnerDebugOutput = FALSE; if (isset($config['showTestRunnerDebugOutput'])) { $showTestRunnerDebugOutput = $config['showTestRunnerDebugOutput']; diff --git a/bootstrap.php b/bootstrap.php index 2ed9731e27bbebd18250094e1b4e79d1ebc28d73..69d4ebb6e268d499a68c9279474699c64b750174 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -69,7 +69,7 @@ $config[$s_arg_insertTraceLogs] = $row[$s_arg_insertTraceLogs]; $config['maxNumberOfTestsWithOneRequest'] = $row['maxNumberOfTestsWithOneRequest']; $config['runner'] = $row['runner']; -$config['showTestRunnerDebugOutput'] = $row['showTestRunnerDebugOutput'] === '1'; +$config['showTestRunnerDebugOutput'] = $row['showTestRunnerDebugOutput'] === '1'; # Note showTestRunnerDebugOutput this is stored in calling service (part of response) $config['environmentVars'] = $row['environmentVars']; //parse environmentVars diff --git a/do_externalCheckerTest_func.php b/do_externalCheckerTest_func.php index 958ecb6403d67e34ecac4f1ce00f8dbaec5c0797..8ff46c0aacfd9504ba5c1acaba7dd18e8d94f379 100644 --- a/do_externalCheckerTest_func.php +++ b/do_externalCheckerTest_func.php @@ -44,8 +44,7 @@ function do_externalCheckerTest($conn, $traceString, $sourceCode, $mainFileName global $isDebug; global $config; - global $s_command_blackBoxTest; - global $s_command_justRunTest; + global $s_command_externalCheckerTest; global $s_test_content; global $s_test_allAssets; global $s_return_val; @@ -61,11 +60,7 @@ function do_externalCheckerTest($conn, $traceString, $sourceCode, $mainFileName global $s_points; - $command_to_execute_string = $s_command_blackBoxTest; - - if ($justRun) { - $command_to_execute_string = $s_command_justRunTest; - } + $command_to_execute_string = $s_command_externalCheckerTest; # compile is done in the runner diff --git a/readme.md b/readme.md index 1e903beb6f42c6dcd6e1954f1d94caaddf0f9019..e5955e78db1f3a12265409ede6f550550df0318b 100644 --- a/readme.md +++ b/readme.md @@ -80,6 +80,10 @@ The commands will probably require the users files (code). This files can be acc * **#9** - all other files (all user files excluding the main file) absolute paths with extension * **#10** - the max points for the test (one can give more or less points, just as a hint) - this is normally only set for external checkers, for other test types this contains -1 + +* **#11** - "true"/"false" if the checker should output the achieved points or not + - default is true, is specified in the test content as `evaluate:true/false` + - only used for external checkers * **#50** - contains the timeout in ms * **#51** - contains the memory limit in kb