Merge pull request #2122 from 9rnsr/fix_test

fix code for stripping "DMD 2.0xx DEBUG" output
dlang · Jun 2, 2013 · b76c54a · b76c54a
2 parents 4c2592c + 929a9c7
commit b76c54a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/test/d_do_test.d b/test/d_do_test.d
@@ -431,6 +431,7 @@ int main(string[] args)
                 }
             }
 
+            compile_output = std.regex.replace(compile_output, regex(`^DMD v2\.[0-9]+.* DEBUG$`, "m"), "");
             compile_output = std.string.strip(compile_output);
             compile_output = compile_output.unifyNewLine();
 
@@ -439,8 +440,6 @@ int main(string[] args)
 
             if (testArgs.compileOutput !is null)
             {
-                compile_output = std.regex.replace(compile_output, regex(`DMD v2\.[0-9]+.* DEBUG\n`, ""), "");
-                compile_output = std.regex.replace(compile_output, regex(`\nDMD v2\.[0-9]+.* DEBUG`, ""), "");
                 enforce(compile_output == testArgs.compileOutput,
                         "\nexpected:\n----\n"~testArgs.compileOutput~"\n----\nactual:\n----\n"~compile_output~"\n----\n");
             }