Skip to content
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

Jump to bottom

rdmd_test.d: Make model flag optional #470

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

rdmd_test.d: Make model flag optional #470

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
18 changes: 12 additions & 6 deletions rdmd_test.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int main(string[] args)
auto helpInfo = getopt(args,
"rdmd-default-compiler", "[REQUIRED] 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,
"m|model", "architecture to run the tests for [32 or 64], can be set to an empty string", &model,
"test-compilers", "comma-separated list of D compilers to test with rdmd", &testCompilerList,
"v|verbose", "verbose output", &verbose,
);
Expand Down Expand Up @@ -125,7 +125,13 @@ int main(string[] args)

string compilerSwitch(string compiler) { return "--compiler=" ~ compiler; }

string modelSwitch(string model) { return "-m" ~ model; }
// Return a compiler argument to build for a given model.
// If model is empty return an empty array.
string[] modelSwitch(string model) {
if (model == "")
return [];
return ["-m" ~ model];
}

auto execute(T...)(T args)
{
Expand Down Expand Up @@ -182,7 +188,7 @@ void runCompilerAgnosticTests(string rdmdApp, string defaultCompiler, string mod

auto rdmdArguments(string rdmdApp, string compiler, string model)
{
return [rdmdApp, compilerSwitch(compiler), modelSwitch(model)];
return [rdmdApp, compilerSwitch(compiler)] ~ modelSwitch(model);
}

void runTests(string rdmdApp, string compiler, string model)
Expand Down Expand Up @@ -267,7 +273,7 @@ void runTests(string rdmdApp, string compiler, string model)
std.file.write(subModSrc, "module dsubpack.submod; void foo() { }");

// build an object file out of the dependency
res = execute([compiler, modelSwitch(model), "-c", "-of" ~ subModObj, subModSrc]);
res = execute([compiler] ~ modelSwitch(model) ~ ["-c", "-of" ~ subModObj, subModSrc]);
enforce(res.status == 0, res.output);

string subModUser = tempDir().buildPath("subModUser_.d");
Expand Down Expand Up @@ -461,7 +467,7 @@ void runTests(string rdmdApp, string compiler, string model)
.filter!exists
.front;

res = execute([rdmdApp, "--compiler=" ~ fullCompilerPath, modelSwitch(model), forceSrc]);
res = execute([rdmdApp, "--compiler=" ~ fullCompilerPath] ~ modelSwitch(model) ~ [forceSrc]);
enforce(res.status == 0, res.output ~ "\nCan't run with --compiler=" ~ fullCompilerPath);

// Create an empty temporary directory and clean it up when exiting scope
Expand Down Expand Up @@ -688,7 +694,7 @@ void runFallbackTest(string rdmdApp, string buildCompiler, string model)
std.file.write(localDMD, ""); // An empty file avoids the "Not a valid 16-bit application" pop-up on Windows
scope(exit) std.file.remove(localDMD);

auto res = execute(rdmdApp ~ [modelSwitch(model), "--force", "--chatty", "--eval=writeln(`Compiler found.`);"]);
auto res = execute(rdmdApp ~ modelSwitch(model) ~ ["--force", "--chatty", "--eval=writeln(`Compiler found.`);"]);
enforce(res.status == 1, res.output);
enforce(res.output.canFind(format(`spawn [%(%s%),`, localDMD.only)), localDMD ~ " would not have been executed. Output:\n" ~ res.output);
}
Loading