Adding upstream version 110.0.1.upstream/110.0.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 93 insertions, 0 deletions

diff --git a/third_party/python/gyp/test/symlinks/gyptest-symlinks.py b/third_party/python/gyp/test/symlinks/gyptest-symlinks.py
new file mode 100755
index 0000000000..278818a992
--- /dev/null
+++ b/third_party/python/gyp/test/symlinks/gyptest-symlinks.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2015 Google Inc. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""
+Test that RelativePath(s, d) doesn't return a path starting with '..' when
+s is textually below d, but is also a symlink to a file that is not below d.
+
+Returning .. in this case would break the Ninja generator in such a case,
+because it computes output directories by concatenating paths, and concat'ing
+a path starting with .. can unexpectedly erase other parts of the path. It's
+difficult to test this directly since the test harness assumes toplevel_dir is
+the root of the repository, but this test should at least verify that the
+required behavior doesn't change.
+"""
+
+import TestGyp
+import os
+import sys
+import tempfile
+
+if sys.platform != 'win32':
+  test = TestGyp.TestGyp()
+
+  # Copy hello.gyp and hello.c to temporary named files, which will then be
+  # symlinked back and processed. Note that we don't ask gyp to touch the
+  # original files at all; they are only there as source material for the copy.
+  # That's why hello.gyp references symlink_hello.c instead of hello.c.
+  with tempfile.NamedTemporaryFile(mode='w+') as gyp_file:
+    with tempfile.NamedTemporaryFile(mode='w+') as c_file:
+      with open('hello.gyp') as orig_gyp_file:
+        gyp_file.write(orig_gyp_file.read())
+        gyp_file.flush()
+      with open('hello.c') as orig_c_file:
+        c_file.write(orig_c_file.read())
+        c_file.flush()
+      # We need to flush the files because we want to read them before closing
+      # them, since when they are closed they will be deleted.
+
+      # Don't proceed with the test on a system that doesn't let you read from
+      # a still-open temporary file.
+      if os.path.getsize(gyp_file.name) == 0:
+        raise OSError("Copy to temporary file didn't work.")
+
+      symlink_gyp = test.built_file_path('symlink_hello.gyp')
+      symlink_c = test.built_file_path('symlink_hello.c')
+      outdir = os.path.dirname(symlink_gyp)
+
+      # Make sure the outdir exists.
+      try:
+        os.makedirs(outdir)
+      except OSError:
+        if not os.path.isdir(outdir):
+          raise
+      os.symlink(gyp_file.name, symlink_gyp)
+      os.symlink(c_file.name, symlink_c)
+
+      # Run gyp on the symlinked files.
+      test.run_gyp(symlink_gyp, chdir=outdir)
+      test.build(symlink_gyp, chdir=outdir)
+      test.run_built_executable('symlink_hello', stdout="Hello, world!\n",
+                                chdir=outdir)
+
+      test.pass_test()
diff --git a/third_party/python/gyp/test/symlinks/hello.c b/third_party/python/gyp/test/symlinks/hello.c
new file mode 100644
index 0000000000..c63204b948
--- /dev/null
+++ b/third_party/python/gyp/test/symlinks/hello.c
@@ -0,0 +1,12 @@
+/* Copyright (c) 2015 Google Inc. All rights reserved.
+   Use of this source code is governed by a BSD-style license that can be
+   found in the LICENSE file.
+*/
+
+#include <stdio.h>
+
+int main(void)
+{
+  printf("Hello, world!\n");
+  return 0;
+}
diff --git a/third_party/python/gyp/test/symlinks/hello.gyp b/third_party/python/gyp/test/symlinks/hello.gyp
new file mode 100644
index 0000000000..81d9f18e09
--- /dev/null
+++ b/third_party/python/gyp/test/symlinks/hello.gyp
@@ -0,0 +1,15 @@
+# Copyright (c) 2015 Google Inc. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'symlink_hello',
+      'type': 'executable',
+      'sources': [
+        'symlink_hello.c',
+      ],
+    },
+  ],
+}