summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2019-04-20 15:19:02 +0200
committerGitHub <noreply@github.com>2019-04-20 15:19:02 +0200
commit0121dda9ba903b764cbd234667cc03f79ebadf44 (patch)
tree6ffcdfa6b68c3f3acc3ed67f9dcc9218b4e2377b /tests
parent44ec66bd484e7cf952c20493a30cf1b29d49e3ca (diff)
downloadNim-0121dda9ba903b764cbd234667cc03f79ebadf44.tar.gz
remove the restriction that module names need to be unique per Nimble… (#11064)
* 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
Diffstat (limited to 'tests')
-rw-r--r--tests/modules/mnotuniquename.nim1
-rw-r--r--tests/modules/tnotuniquename.nim9
-rw-r--r--tests/modules/tnotuniquename/mnotuniquename.nim0
-rw-r--r--tests/modules/tnotuniquename2.nim1
-rw-r--r--tests/modules/tnotuniquename_dir/mnotuniquename.nim2
5 files changed, 10 insertions, 3 deletions
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
--- a/tests/modules/tnotuniquename/mnotuniquename.nim
+++ /dev/null
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"