Skip to content

support relative compiler filenames in rdmd_test #333

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

support relative compiler filenames in rdmd_test #333

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
4 changes: 2 additions & 2 deletions posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ clean:
$(ROOT)/tests_extractor: tests_extractor.d
mkdir -p $(ROOT)
DFLAGS="$(DFLAGS)" $(DUB) build \
--single $< --force --compiler=$(abspath $(DMD)) $(DUBFLAGS) \
--single $< --force --compiler=$(DMD) $(DUBFLAGS) \
&& mv ./tests_extractor $@

################################################################################
Expand All @@ -110,7 +110,7 @@ test_tests_extractor: $(ROOT)/tests_extractor
$< -i ./test/tests_extractor/ascii.d | diff - ./test/tests_extractor/ascii.d.ext
$< -i ./test/tests_extractor/iteration.d | diff - ./test/tests_extractor/iteration.d.ext

RDMD_TEST_COMPILERS = $(abspath $(DMD))
RDMD_TEST_COMPILERS = $(DMD)
RDMD_TEST_EXECUTABLE = $(ROOT)/rdmd
RDMD_TEST_DEFAULT_COMPILER = $(basename $(DMD))

Expand Down
5 changes: 5 additions & 0 deletions rdmd_test.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ void main(string[] args)
// run the test suite for each specified test compiler
foreach (testCompiler; testCompilerList.split(','))
{
// if compiler is a relative filename it must be converted
// to absolute because this test changes directories
if (testCompiler.canFind!isDirSeparator || testCompiler.exists)
testCompiler = buildNormalizedPath(testCompiler.absolutePath);

runTests(rdmdApp, testCompiler, model);
if (concurrencyTest)
runConcurrencyTest(rdmdApp, testCompiler, model);
Expand Down