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

Unified Diff: test/msvs/buildevents/gyptest-ninja-warnings.py

Issue 139803002: win ninja: build fix for msvs_pre/postbuild error test (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Created 6 years, 11 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 | « pylib/gyp/msvs_emulation.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/msvs/buildevents/gyptest-ninja-warnings.py
diff --git a/test/msvs/buildevents/gyptest-ninja-warnings.py b/test/msvs/buildevents/gyptest-ninja-warnings.py
index 44f9e3eee2e9079f34432f901eca74cf0d8d7e9f..732a200a5efe2eb9b64aac1736913969897ebe60 100755
--- a/test/msvs/buildevents/gyptest-ninja-warnings.py
+++ b/test/msvs/buildevents/gyptest-ninja-warnings.py
@@ -1,24 +1,29 @@
#!/usr/bin/env python
-# Copyright (c) 2011 Google Inc. All rights reserved.
+# Copyright (c) 2014 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.
"""
-Verifies that ninja warns about msvs_prebuild/msvs_postbuild.
+Verifies that ninja errors out when encountering msvs_prebuild/msvs_postbuild.
"""
import sys
+import TestCmd
import TestGyp
if sys.platform == 'win32':
test = TestGyp.TestGyp(formats=['ninja'])
- test.run_gyp('buildevents.gyp')
+ test.run_gyp('buildevents.gyp',
+ status=1,
+ stderr='.*msvs_prebuild not supported \(target main\).*',
+ match=TestCmd.match_re_dotall)
- test.must_contain_all_lines(test.stdout(),
- ['Warning: msvs_prebuild not supported, dropping. (target main)',
- 'Warning: msvs_postbuild not supported, dropping. (target main)'])
+ test.run_gyp('buildevents.gyp',
+ status=1,
+ stderr='.*msvs_postbuild not supported \(target main\).*',
+ match=TestCmd.match_re_dotall)
test.pass_test()
« no previous file with comments | « pylib/gyp/msvs_emulation.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698