diff options
| author | Dominik Picheta <dominikpicheta@gmail.com> | 2017-09-02 15:28:25 +0100 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@gmail.com> | 2017-09-02 15:28:25 +0100 |
| commit | 90fa64501f0eba487182a760fde98f7bb955c3d7 (patch) | |
| tree | c4d9199a774b570ed8ebe5e4c27117c4a5c03933 /tests | |
| parent | 9b465a236159423c344395194b2e4963e5d8adba (diff) | |
| download | Nim-90fa64501f0eba487182a760fde98f7bb955c3d7.tar.gz | |
Implement .nimble-link files in the compiler and add tests for them.
Diffstat (limited to 'tests')
5 files changed, 15 insertions, 1 deletions
diff --git a/tests/nimble/nimbleDir/linkedPkgs/pkgA-0.1.0/pkgA.nimble-link b/tests/nimble/nimbleDir/linkedPkgs/pkgA-0.1.0/pkgA.nimble-link new file mode 100644 index 000000000..8dc825fc9 --- /dev/null +++ b/tests/nimble/nimbleDir/linkedPkgs/pkgA-0.1.0/pkgA.nimble-link @@ -0,0 +1,2 @@ +../../simplePkgs/pkgA-0.1.0/pkgA.nimble +../../simplePkgs/pkgA-0.1.0/ \ No newline at end of file diff --git a/tests/nimble/nimbleDir/linkedPkgs/pkgB-#head/pkgB.nimble-link b/tests/nimble/nimbleDir/linkedPkgs/pkgB-#head/pkgB.nimble-link new file mode 100644 index 000000000..a57a3cb66 --- /dev/null +++ b/tests/nimble/nimbleDir/linkedPkgs/pkgB-#head/pkgB.nimble-link @@ -0,0 +1,2 @@ +../../simplePkgs/pkgB-#head/pkgB.nimble +../../simplePkgs/pkgB-#head/ \ No newline at end of file diff --git a/tests/nimble/nimbleDir/linkedPkgs/pkgB-0.1.0/pkgB.nimble-link b/tests/nimble/nimbleDir/linkedPkgs/pkgB-0.1.0/pkgB.nimble-link new file mode 100644 index 000000000..9643c0fa0 --- /dev/null +++ b/tests/nimble/nimbleDir/linkedPkgs/pkgB-0.1.0/pkgB.nimble-link @@ -0,0 +1,2 @@ +../../simplePkgs/pkgB-0.1.0/pkgB.nimble +../../simplePkgs/pkgB-0.1.0/ \ No newline at end of file diff --git a/tests/nimble/tnimblepathlink.nim b/tests/nimble/tnimblepathlink.nim new file mode 100644 index 000000000..5b2c7cb5b --- /dev/null +++ b/tests/nimble/tnimblepathlink.nim @@ -0,0 +1,9 @@ +discard """ + action: run + cmd: "nim $target --nimblePath:$fileDir/nimbleDir/linkedPkgs $options $file" +""" +import pkgA/module as A +import pkgB/module as B + +doAssert pkgATest() == 1, "Simple linked pkgA-0.1.0 wasn't added to path correctly." +doAssert pkgBTest() == 0xDEADBEEF, "linked pkgB-#head wasn't picked over pkgB-0.1.0" \ No newline at end of file diff --git a/tests/testament/tester.nim b/tests/testament/tester.nim index 06fd4acec..e4bbc3a00 100644 --- a/tests/testament/tester.nim +++ b/tests/testament/tester.nim @@ -80,7 +80,6 @@ proc callCompiler(cmdTemplate, filename, options: string, let c = parseCmdLine(cmdTemplate % ["target", targetToCmd[target], "options", options, "file", filename.quoteShell, "filedir", filename.getFileDir()]) - echo(c) var p = startProcess(command=c[0], args=c[1.. ^1], options={poStdErrToStdOut, poUsePath}) let outp = p.outputStream |