Commit 8ffeef1

authored

Merge pull request #6 from ThomasChen0717/dev

Add support for Unix OS

2 parents 9f4ea0f + a4cd841 commit 8ffeef1Copy full SHA for 8ffeef1

File tree

+21

-4

lines changed

+21

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,4 @@ set(CMAKE_INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)`
`33`	`33`	`install(TARGETS solution_cpp`
`34`	`34`	`CONFIGURATIONS Release`
`35`	`35`	`RUNTIME DESTINATION ${CMAKE_INSTALL_DIR}`
`36`		`-)`
	`36`	`+)`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,13 @@`
`18`	`18`	`TESTCAST_OUTPUT_DIR = "testcase_output"`
`19`	`19`
`20`	`20`	`def run(command):`
`21`		`- result = subprocess.run(command.split(),`
	`21`	`+ if os.name == 'posix':`
	`22`	`+ result = subprocess.run(command,`
	`23`	`+ stdout=subprocess.PIPE,`
	`24`	`+ stderr=subprocess.STDOUT,`
	`25`	`+ shell=True)`
	`26`	`+ else:`
	`27`	`+ result = subprocess.run(command.split(),`
`22`	`28`	`stdout=subprocess.PIPE,`
`23`	`29`	`stderr=subprocess.STDOUT,`
`24`	`30`	`shell=True)`
`@@ -159,7 +165,11 @@ def main():`
`159`	`165`	`f"problem_builds_dir and problem arguments."))`
`160`	`166`	`sys.exit(1)`
`161`	`167`
`162`		`- exe_file = os.path.abspath(os.path.join(bin_dir,`
	`168`	`+ if os.name == 'posix':`
	`169`	`+ exe_file = os.path.abspath(os.path.join(bin_dir,`
	`170`	`+ f"solution_{args.language}"))`
	`171`	`+ else:`
	`172`	`+ exe_file = os.path.abspath(os.path.join(bin_dir,`
`163`	`173`	`f"solution_{args.language}.exe"))`
`164`	`174`
`165`	`175`	`if not os.path.isfile(exe_file):`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,14 @@ def runTest(exec_filename, testcase_filename, output_filename):`
`69`	`69`	`f"{os.path.abspath(output_filename)}"`
`70`	`70`	`)`
`71`	`71`	`logger.log(f"Running command: {command}")`
`72`		`- result = subprocess.run(command,`
	`72`	`+ if os.name == 'posix':`
	`73`	`+ result = subprocess.run(command,`
	`74`	`+ shell=True,`
	`75`	`+ cwd=os.path.dirname(exec_filename),`
	`76`	`+ timeout=PROBLEM_LTE_S,`
	`77`	`+ stderr=subprocess.PIPE)`
	`78`	`+ else:`
	`79`	`+ result = subprocess.run(command,`
`73`	`80`	`shell=False,`
`74`	`81`	`cwd=os.path.dirname(exec_filename),`
`75`	`82`	`timeout=PROBLEM_LTE_S,`

Comments

(0)