From 0121dda9ba903b764cbd234667cc03f79ebadf44 Mon Sep 17 00:00:00 2001 From: Andreas Rumpf Date: Sat, 20 Apr 2019 15:19:02 +0200 Subject: remove the restriction that module names need to be unique per Nimble… (#11064) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * remove the restriction that module names need to be unique per Nimble package * make tests green again * use the 'response' linker file also on Unix in order to fix megatest --- tests/modules/mnotuniquename.nim | 1 + tests/modules/tnotuniquename.nim | 9 ++++++--- tests/modules/tnotuniquename/mnotuniquename.nim | 0 tests/modules/tnotuniquename2.nim | 1 + tests/modules/tnotuniquename_dir/mnotuniquename.nim | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) delete mode 100644 tests/modules/tnotuniquename/mnotuniquename.nim create mode 100644 tests/modules/tnotuniquename_dir/mnotuniquename.nim (limited to 'tests') diff --git a/tests/modules/mnotuniquename.nim b/tests/modules/mnotuniquename.nim index e69de29bb..54d5883cd 100644 --- a/tests/modules/mnotuniquename.nim +++ b/tests/modules/mnotuniquename.nim @@ -0,0 +1 @@ +proc flat*() = echo "flat" diff --git a/tests/modules/tnotuniquename.nim b/tests/modules/tnotuniquename.nim index 403c8a47e..bc401e662 100644 --- a/tests/modules/tnotuniquename.nim +++ b/tests/modules/tnotuniquename.nim @@ -1,7 +1,10 @@ discard """ - errormsg: "module names need to be unique per Nimble package" - file: "tnotuniquename/mnotuniquename.nim" + output: '''nested +flat''' """ import mnotuniquename -import tnotuniquename/mnotuniquename as nun +import tnotuniquename_dir/mnotuniquename as nun + +nested() +flat() diff --git a/tests/modules/tnotuniquename/mnotuniquename.nim b/tests/modules/tnotuniquename/mnotuniquename.nim deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/modules/tnotuniquename2.nim b/tests/modules/tnotuniquename2.nim index 7aa4de515..e4501bc24 100644 --- a/tests/modules/tnotuniquename2.nim +++ b/tests/modules/tnotuniquename2.nim @@ -1,6 +1,7 @@ discard """ errormsg: "module names need to be unique per Nimble package" file: "tnotuniquename/mnotuniquename.nim" + disabled: "true" """ import mnotuniquename diff --git a/tests/modules/tnotuniquename_dir/mnotuniquename.nim b/tests/modules/tnotuniquename_dir/mnotuniquename.nim new file mode 100644 index 000000000..11e52d9d0 --- /dev/null +++ b/tests/modules/tnotuniquename_dir/mnotuniquename.nim @@ -0,0 +1,2 @@ + +proc nested*() = echo "nested" -- cgit 1.4.1-2-gfad0 21d670c754501e1c14c758e09c9fce3ad01d5'>tests/newconfig/mymath.nim

blob: 5668b448beb4a4a3c163ab9cad18c4b3242bc585 (plain) (tree)

5e82ffc8d ^