Merge pull request #1323 from braddr/test-changes

further the use of result_path
dlang · Nov 25, 2012 · 4943492 · 4943492
2 parents 7a1123d + 8833623
commit 4943492
Showing 1 changed file with 4 additions and 5 deletions.
diff --git 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,