From 88336231b363ab1f0636a68cc7441f180424881c Mon Sep 17 00:00:00 2001 From: Brad Roberts Date: Sat, 24 Nov 2012 17:02:23 -0800 Subject: [PATCH] further the use of result_path --- test/d_do_test.d | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/d_do_test.d b/test/d_do_test.d index 0b324b5d13b0..a567adce754e 100755 --- a/test/d_do_test.d +++ b/test/d_do_test.d @@ -304,11 +304,11 @@ int main(string[] args) envData.model = getenv("MODEL"); envData.required_args = getenv("REQUIRED_ARGS"); + string result_path = envData.results_dir ~ envData.sep; string input_file = input_dir ~ envData.sep ~ test_name ~ "." ~ test_extension; - string output_dir = envData.results_dir ~ envData.sep ~ input_dir; - string output_file = envData.results_dir ~ envData.sep ~ input_dir ~ envData.sep ~ test_name ~ "." ~ test_extension ~ ".out"; + string output_dir = result_path ~ input_dir; + string output_file = result_path ~ input_dir ~ envData.sep ~ test_name ~ "." ~ test_extension ~ ".out"; string test_app_dmd_base = output_dir ~ envData.sep ~ test_name ~ "_"; - string result_path = envData.results_dir ~ envData.sep; TestArgs testArgs; @@ -380,8 +380,7 @@ int main(string[] args) { foreach (filename; testArgs.sources) { - string newo= envData.results_dir ~ envData.sep ~ - replace(replace(filename, ".d", envData.obj), envData.sep~"imports"~envData.sep, envData.sep); + string newo= result_path ~ replace(replace(filename, ".d", envData.obj), envData.sep~"imports"~envData.sep, envData.sep); toCleanup ~= newo; string command = format("%s -m%s -I%s %s %s -od%s -c %s", envData.dmd, envData.model, input_dir,