Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Unified Diff: test/same-source-file-name/gyptest-static.py

Issue 1151963003: Revert "Stop checking for duplicate basenames" (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: . Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/same-source-file-name/gyptest-shared.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/same-source-file-name/gyptest-static.py
diff --git a/test/same-source-file-name/gyptest-static.py b/test/same-source-file-name/gyptest-static.py
index fc067e9885fbc9a0f11db6119fc1eba0312ad5a4..7fa27720403b3c6e5b9d1e23fe040feef3dc8f33 100755
--- a/test/same-source-file-name/gyptest-static.py
+++ b/test/same-source-file-name/gyptest-static.py
@@ -5,7 +5,7 @@
# found in the LICENSE file.
"""
-Checks that gyp succeeds on static_library targets which have several files with
+Checks that gyp fails on static_library targets which have several files with
the same basename.
"""
@@ -16,13 +16,18 @@ import TestGyp
test = TestGyp.TestGyp()
+# Fails by default for the compatibility with legacy generators such as
+# VCProj generator for Visual C++ 2008 and Makefile generator on Mac.
+# TODO: Update expected behavior when these legacy generators are deprecated.
+test.run_gyp('double-static.gyp', chdir='src', status=1, stderr=None)
+
if ((test.format == 'make' and sys.platform == 'darwin') or
(test.format == 'msvs' and
int(os.environ.get('GYP_MSVS_VERSION', 2010)) < 2010)):
- test.run_gyp('double-static.gyp',
+ test.run_gyp('double-static.gyp', '--no-duplicate-basename-check',
chdir='src', status=1, stderr=None)
else:
- test.run_gyp('double-static.gyp',
+ test.run_gyp('double-static.gyp', '--no-duplicate-basename-check',
chdir='src')
test.build('double-static.gyp', test.ALL, chdir='src')
« no previous file with comments | « test/same-source-file-name/gyptest-shared.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698