Fix error code printing for segfault.

Author: mbucko

data/languages/cpp/CMakeLists.txt

@@ -76,11 +76,9 @@ target_link_libraries(solution_expected_cpp PRIVATE nlohmann_json::nlohmann_json
 set(CMAKE_INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
 install(TARGETS solution_cpp
- CONFIGURATIONS Release
  RUNTIME DESTINATION ${CMAKE_INSTALL_DIR}
 )
 
 install(TARGETS solution_expected_cpp
- CONFIGURATIONS Release
  RUNTIME DESTINATION ${CMAKE_INSTALL_DIR}
 )

src/app/logger.py

@@ -17,6 +17,7 @@ def log(message: str):
  print(message)
 
 def logResults(results):
- #TODO: Print indivitual test status for a failed run?
+ duration = ("Unknown" if "duration_ms" not in results
+ else str(results["duration_ms"]) + "ms")
  print("Status: " + str(results["status"]) + "\n" +
- "Duration: " + str(results["duration_ms"]) + "ms")
+ "Duration: " + duration)

src/app/openleetcode.py

@@ -213,17 +213,17 @@ def main():
 
  if not os.path.isfile(os.path.join(build_dir, "CMakeCache.txt")):
  print("CMakeCache.txt does not exist. Running CMake to configure the ")
- if run(f"cmake -B {build_dir}", src_dir) != 0:
+ if run(f"cmake -B {build_dir} -DCMAKE_BUILD_TYPE=Debug", src_dir) != 0:
  print(logger.red(f"CMake failed!"))
  sys.exit(1)
  else:
  print("CMakeCache.txt exists. Skipping CMake configuration.")
 
- if run(f"cmake --build . --config Release -j", build_dir) != 0:
+ if run(f"cmake --build . --config Debug -j", build_dir) != 0:
  print(logger.red("Build failed!"))
  sys.exit(1)
 
- if run(f"cmake --install .", build_dir) != 0:
+ if run(f"cmake --install . --config Debug -v", build_dir) != 0:
  print(logger.red("Cmake install failed!"))
  sys.exit(1)
 

src/app/testrunner.py

@@ -60,14 +60,20 @@ def runTests(exec_filename,
  timeout=PROBLEM_LTE_S,
  stdout=subprocess.PIPE,
  stderr=subprocess.PIPE)
-
  except subprocess.TimeoutExpired:
  return 1, f"Time Limit Exceeded"
  except Exception as e:
  return 1, f"Error running the test, error={e}"
 
  if not os.path.isfile(test_restults_filename):
- return 1, f"The file {test_restults_filename} does not exist."
+ jsonResultsObj = {
+ "status": "Failed",
+ "stderr": subprocess_obj.stderr.decode('utf-8'),
+ "stdout": subprocess_obj.stdout.decode('utf-8'),
+ "errorcode": hex(subprocess_obj.returncode)
+ }
+ with open(test_restults_filename, 'w') as f:
+ json.dump(jsonResultsObj, f, indent=4)
 
  # read test_restults_filename into a json object
  with open(test_restults_filename, 'r') as f:

src/schema/results_validation_schema.json

@@ -96,15 +96,31 @@
  "$ref": "#/definitions/testcase_filter_name_schema"
  }
  },
- "required": ["duration_ms", "status", "tests", "stderr"],
- "if": {
- "not": {
- "properties": {
- "testcase_filter_name": { "pattern": "^All$", "flags": "i" }
+ "required": ["status"],
+ "allOf": [
+ {
+ "if": {
+ "properties": {
+ "errorcode": {}
+ },
+ "required": ["errorcode"]
+ },
+ "then": {
+ "required": ["stdout", "stderr"]
+ },
+ "else": {
+ "required": ["duration_ms", "tests", "stderr"],
+ "if": {
+ "not": {
+ "properties": {
+ "testcase_filter_name": { "pattern": "^All$", "flags": "i" }
+ }
+ }
+ },
+ "then": {
+ "required": ["stdout"]
+ }
  }
  }
- },
- "then": {
- "required": ["stdout"]
- }
+ ]
 }

src/ui/index.js

@@ -41,13 +41,17 @@ function saveSolution(language, content) {
  file.writeFileSync(userSolutionFilename, content);
 }
 
-function parseStdout(stdout) {
+function parseResultsFileFromStdout(stdout) {
  // stdout:
  // LongestSubstringWithoutRepeatingCharacters for testcase All in language cpp
  // Results written to /path\to/openleetcode/src/ui/testcase_output/<testname><datetime>.results
  // Status: <status>
  // Duration: <duration>ms
- return stdout.match(/Results written to (.*\.results)/)[1];
+ match = stdout.match(/Results written to (.*\.results)/);
+ if (!match || match.length === 0) {
+ return null;
+ }
+ return match[1];
 }
 
 function parseBuildError(stdout) {
@@ -156,31 +160,36 @@ function run(callback, testcase = 'All', expected = false) {
 
  var resultsFilename;
  exec(command, (error, stdout, stderr) => {
- if (error) {
+ var element = document.getElementById("compilation-content");
+ 
+ element.textContent = "";
+ resultsFilename = parseResultsFileFromStdout(stdout);
+ if (!resultsFilename || !file.existsSync(resultsFilename)) {
+ console.log("Setting error");
  console.log("Error running the command, error: " + error +
  ", stderr: " + stderr + ", stdout: " + stdout);
- var element = document.getElementById("compilation-content");
- element.textContent = parseBuildError(stdout + "\n" + error);
+ element.textContent = parseBuildError(stdout);
  document.getElementById('tab-compilation-button').click();
  return;
  }
- var element = document.getElementById("compilation-content");
- element.textContent = "";
- 
- resultsFilename = parseStdout(stdout);
- if (!resultsFilename) {
- throw new Error("Could not parse results filename from stdout: " +
- "${stdout}");
- }
 
- if (!file.existsSync(resultsFilename)) {
- throw new Error(`Results file does not exist: ${resultsFilename}`);
- }
- 
  const results = file.readFileSync(resultsFilename, 'utf8');
  console.log(results);
  const resultsJson = JSON.parse(results);
- callback(resultsJson);
+ errorcode = resultsJson["errorcode"];
+ console.log("errorcode: " + errorcode);
+ if (errorcode != undefined && errorcode !== 0) {
+ html = "<p>Errorcode: " + resultsJson.errorcode + "</p>";
+ html += "<p>Stdout: " + resultsJson.stdout + "</p>";
+ html += "<p>Stderr: " + resultsJson.stderr + "</p>";
+
+ element.innerHTML = html;
+ document.getElementById('tab-compilation-button').click();
+ return;
+ } else {
+ console.log("Setting results");
+ callback(resultsJson);
+ }
  });
 }