Merge: curl: basic Unix domain socket support

[nit.git] / src / loader.nit

diff --git a/src/loader.nit b/src/loader.nit
index 1502c40..f18d7be 100644 (file)
--- a/src/loader.nit
+++ b/src/loader.nit
@@ -39,6 +39,7 @@ module loader
 
 import modelbuilder_base
 import ini
+import picnit_shared
 
 redef class ToolContext
        # Option --path
@@ -65,6 +66,11 @@ redef class ModelBuilder
                # Setup the paths value
                paths.append(toolcontext.opt_path.value)
 
+               # Packages managed by picnit, only use when not testing with tests.sh
+               if "NIT_TESTING_TESTS_SH".environ != "true" then
+                       paths.add picnit_lib_dir
+               end
+
                var path_env = "NIT_PATH".environ
                if not path_env.is_empty then
                        paths.append(path_env.split_with(':'))
@@ -135,6 +141,7 @@ redef class ModelBuilder
                                alpha_comparator.sort(fs)
                                # Try each entry as a group or a module
                                for f in fs do
+                                       if f.first == '.' then continue
                                        var af = a/f
                                        mgroup = identify_group(af)
                                        if mgroup != null then
@@ -636,6 +643,7 @@ redef class ModelBuilder
                var files = p.files
                alpha_comparator.sort(files)
                for f in files do
+                       if f.first == '.' then continue
                        var fp = p/f
                        var g = identify_group(fp)
                        # Recursively scan for groups of the same package
@@ -810,8 +818,6 @@ redef class ModelBuilder
                                mmodule.mdoc = mdoc
                                mdoc.original_mentity = mmodule
                        end
-                       # Is the module a test suite?
-                       mmodule.is_test_suite = not decl.get_annotations("test_suite").is_empty
                        # Is the module generated?
                        mmodule.is_generated = not decl.get_annotations("generated").is_empty
                end