Skip to content

Make --rdmd-default-compiler optional #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marler8997 wants to merge 1 commit into from
Closed

Make --rdmd-default-compiler optional #339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions rdmd_test.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ int main(string[] args)
string testCompilerList; // e.g. "ldmd2,gdmd" (comma-separated list of compiler names)

auto helpInfo = getopt(args,
"rdmd-default-compiler", "[REQUIRED] default D compiler used by rdmd executable", &defaultCompiler,
"rdmd-default-compiler", "default D compiler used by rdmd executable", &defaultCompiler,
"concurrency", "whether to perform the concurrency test cases", &concurrencyTest,
"m|model", "architecture to run the tests for [32 or 64]", &model,
"test-compilers", "comma-separated list of D compilers to test with rdmd", &testCompilerList,
Expand Down Expand Up @@ -86,9 +86,6 @@ int main(string[] args)
if (rdmd.length == 0)
reportHelp("ERROR: missing required --rdmd flag");

if (defaultCompiler.length == 0)
reportHelp("ERROR: missing required --rdmd-default-compiler flag");

enforce(rdmd.exists,
format("rdmd executable path '%s' does not exist", rdmd));

Expand Down Expand Up @@ -134,7 +131,7 @@ auto execute(T...)(T args)
return std.process.execute(args);
}

void runCompilerAgnosticTests(string rdmdApp, string defaultCompiler, string model)
void runCompilerAgnosticTests(string rdmdApp, ref string defaultCompiler, string model)
{
/* Test help string output when no arguments passed. */
auto res = execute([rdmdApp]);
Expand All @@ -155,7 +152,14 @@ void runCompilerAgnosticTests(string rdmdApp, string defaultCompiler, string mod
assert(offset >= 0);
auto compilerInHelp = helpText[offset + compilerHelpLine.length .. $];
compilerInHelp = compilerInHelp[0 .. compilerInHelp.indexOf('\n')];
assert(defaultCompiler.baseName == compilerInHelp);
if (defaultCompiler.length > 0)
assert(defaultCompiler.baseName == compilerInHelp);
else
{
writefln("Warning: missing --rdmd-default-compiler option, using '%s' from rdmd's help text",
compilerInHelp);
defaultCompiler = compilerInHelp;
}
}

// run the fallback compiler test (this involves
Expand Down