summaryrefslogtreecommitdiff
path: root/test/standalone-static-library/gyptest-standalone-static-library.py
diff options
context:
space:
mode:
authortorne@chromium.org <torne@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af>2012-12-12 16:24:59 +0000
committertorne@chromium.org <torne@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af>2012-12-12 16:24:59 +0000
commit49f5a9877ff88aa5e04b305674a0b56eb378f1d6 (patch)
tree3b3a8df5a01bef8b04032a7e946f6c47ae72e99f /test/standalone-static-library/gyptest-standalone-static-library.py
parent54aee1941b7d83836bef1d9553e1961e6aad1b71 (diff)
downloadgyp-49f5a9877ff88aa5e04b305674a0b56eb378f1d6.tar.gz
Fix/disable various tests for the Android backend.
The Android backend doesn't support some of the features being tested; disalbe the tests to fix things. Also, the Android build system has -Werror always enabled and lots of warnings enabled by default, so fix warnings in trivial C programs used in tests. BUG=gyp:275 Review URL: https://codereview.chromium.org/11498009 git-svn-id: http://gyp.googlecode.com/svn/trunk@1548 78cadc50-ecff-11dd-a971-7dbc132099af
Diffstat (limited to 'test/standalone-static-library/gyptest-standalone-static-library.py')
-rw-r--r--test/standalone-static-library/gyptest-standalone-static-library.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/standalone-static-library/gyptest-standalone-static-library.py b/test/standalone-static-library/gyptest-standalone-static-library.py
index 89f5cbea..91198b45 100644
--- a/test/standalone-static-library/gyptest-standalone-static-library.py
+++ b/test/standalone-static-library/gyptest-standalone-static-library.py
@@ -13,7 +13,11 @@ import subprocess
import sys
import TestGyp
-test = TestGyp.TestGyp()
+# standalone_static_library currently means two things: a specific output
+# location for the built target and non-thin archive files. The Android gyp
+# generator leaves both decisions to the Android build system, so this test
+# doesn't work for that format.
+test = TestGyp.TestGyp(formats=['!android'])
# Verify that types other than static_library cause a failure.
test.run_gyp('invalid.gyp', status=1, stderr=None)
@@ -50,4 +54,4 @@ if test.format in ('make', 'ninja') and sys.platform.startswith('linux'):
retcode = subprocess.call(['ar', '-x', path])
assert retcode == 0
-test.pass_test() \ No newline at end of file
+test.pass_test()