fix --valid-abspath on paths that are not trivially valid. this broke in a refactoring. improve tests to prevent that happening again (#5854)

Author: kripken

emcc.py

@@ -575,15 +575,6 @@ def uniquename(name):
   def in_temp(name):
     return os.path.join(temp_dir, os.path.basename(name))
 
-  def in_directory(root, child):
-    # make both path absolute
-    root = os.path.realpath(root)
-    child = os.path.realpath(child)
-
-    # return true, if the common prefix of both is equal to directory
-    # e.g. /a/b/c/d.rst and directory is /a/b, the common prefix is /a/b
-    return os.path.commonprefix([root, child]) == root
-
   # Parses the essential suffix of a filename, discarding Unix-style version numbers in the name. For example for 'libz.so.1.2.8' returns '.so'
   def filename_type_suffix(filename):
     for i in reversed(filename.split('.')[1:]):
@@ -2693,6 +2684,15 @@ def is_valid_abspath(options, path_name):
   if shared.path_from_root().replace('\\', '/') in path_name.replace('\\', '/'):
     return True
 
+  def in_directory(root, child):
+    # make both path absolute
+    root = os.path.realpath(root)
+    child = os.path.realpath(child)
+
+    # return true, if the common prefix of both is equal to directory
+    # e.g. /a/b/c/d.rst and directory is /a/b, the common prefix is /a/b
+    return os.path.commonprefix([root, child]) == root
+
   for valid_abspath in options.valid_abspaths:
     if in_directory(valid_abspath, path_name):
       return True

tests/test_other.py

@@ -3445,6 +3445,16 @@ def test_valid_abspath(self):
     out, err = process.communicate()
     assert(warning not in err)
 
+  def test_valid_abspath_2(self):
+    if WINDOWS:
+      abs_include_path = 'C:\\nowhere\\at\\all'
+    else:
+      abs_include_path = '/nowhere/at/all'
+    cmd = [PYTHON, EMCC, path_from_root('tests', 'hello_world.c'), '--valid-abspath', abs_include_path,'-I%s' % abs_include_path]
+    print(' '.join(cmd))
+    subprocess.check_call(cmd)
+    self.assertContained('hello, world!', run_js('a.out.js'))
+
   def test_warn_dylibs(self):
     shared_suffixes = ['.so', '.dylib', '.dll']