Skip to content

fix issue 17198 - rdmd does not recompile when --extra-file is added #218

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
aG0aep6G wants to merge 1 commit into from
Closed

fix issue 17198 - rdmd does not recompile when --extra-file is added #218

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions rdmd.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ private string getWorkPath(in string root, in string[] compilerFlags)
if (irrelevantSwitches.canFind(flag)) continue;
context.put(flag.representation);
}
foreach (f; extraFiles) context.put(f.representation);
auto digest = context.finish();
string hash = toHexString(digest);

Expand Down
23 changes: 21 additions & 2 deletions rdmd_test.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ void runTests()
/* [REG2.072.0] pragma(lib) is broken with rdmd: https://issues.dlang.org/show_bug.cgi?id=16978 */

version (linux)
{
{{
TmpDir srcDir = "rdmdTest";
string libSrcName = srcDir.buildPath("libfun.d");
std.file.write(libSrcName, `extern(C) void fun() {}`);
Expand All @@ -460,7 +460,7 @@ void runTests()

res = execute([rdmdApp, compilerSwitch, "-L-L" ~ srcDir, mainSrcName]);
assert(res.status == 0, res.output);
}
}}

/* https://issues.dlang.org/show_bug.cgi?id=16966 */
{
Expand All @@ -473,6 +473,25 @@ void runTests()
assert(exists(voidMainExe));
remove(voidMainExe);
}

/* https://issues.dlang.org/show_bug.cgi?id=17198 - rdmd does not recompile
when --extra-file is added */
{
TmpDir srcDir = "rdmdTest";
immutable string src1 = srcDir.buildPath("test.d");
immutable string src2 = srcDir.buildPath("test2.d");
std.file.write(src1, "int x = 1; int main() { return x; }");
std.file.write(src2, "import test; static this() { x = 0; }");

res = execute([rdmdApp, compilerSwitch, src1]);
assert(res.status == 1, res.output);

res = execute([rdmdApp, compilerSwitch, "--extra-file=" ~ src2, src1]);
assert(res.status == 0, res.output);

res = execute([rdmdApp, compilerSwitch, src1]);
assert(res.status == 1, res.output);
}
}

void runConcurrencyTest()
Expand Down