Skip to content

Split compiler agnostic tests so they are only run once instead of once per compiler #334

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

Merged
dlang-bot merged 1 commit into from
Mar 19, 2018
Merged

Split compiler agnostic tests so they are only run once instead of once per compiler #334

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
35 changes: 20 additions & 15 deletions rdmd_test.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ void main(string[] args)
scope (exit) std.file.remove(rdmdApp);
copy(rdmd, rdmdApp, Yes.preserveAttributes);

runCompilerAgnosticTests(rdmdApp, defaultCompiler, model);

// if no explicit list of test compilers is set,
// use the default compiler expected by rdmd
if (testCompilerList is null)
Expand All @@ -107,11 +109,6 @@ void main(string[] args)
if (concurrencyTest)
runConcurrencyTest(rdmdApp, testCompiler, model);
}

// run the fallback compiler test (this involves
// searching for the default compiler, so cannot
// be run with other test compilers)
runFallbackTest(rdmdApp, defaultCompiler, model);
}

string compilerSwitch(string compiler) { return "--compiler=" ~ compiler; }
Expand All @@ -126,16 +123,8 @@ auto execute(T...)(T args)
return std.process.execute(args);
}

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

void runTests(string rdmdApp, string compiler, string model)
void runCompilerAgnosticTests(string rdmdApp, string defaultCompiler, string model)
{
// path to rdmd + common arguments (compiler, model)
auto rdmdArgs = rdmdArguments(rdmdApp, compiler, model);

/* Test help string output when no arguments passed. */
auto res = execute([rdmdApp]);
assert(res.status == 1, res.output);
Expand All @@ -146,11 +135,27 @@ void runTests(string rdmdApp, string compiler, string model)
assert(res.status == 0, res.output);
assert(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS]... program [PROGRAM OPTIONS]..."));

// run the fallback compiler test (this involves
// searching for the default compiler, so cannot
// be run with other test compilers)
runFallbackTest(rdmdApp, defaultCompiler, model);
}

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

void runTests(string rdmdApp, string compiler, string model)
{
// path to rdmd + common arguments (compiler, model)
auto rdmdArgs = rdmdArguments(rdmdApp, compiler, model);

/* Test --force. */
string forceSrc = tempDir().buildPath("force_src_.d");
std.file.write(forceSrc, `void main() { pragma(msg, "compile_force_src"); }`);

res = execute(rdmdArgs ~ [forceSrc]);
auto res = execute(rdmdArgs ~ [forceSrc]);
assert(res.status == 0, res.output);
assert(res.output.canFind("compile_force_src"));

Expand Down