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

5 files changed, 16 insertions, 5 deletions

diff --git a/test/copies/gyptest-updir.py b/test/copies/gyptest-updir.py
index 1bb9b1d1..00b01c72 100755
--- a/test/copies/gyptest-updir.py
+++ b/test/copies/gyptest-updir.py
@@ -11,7 +11,8 @@ yields a make variable.
 
 import TestGyp
 
-test = TestGyp.TestGyp()
+# The Android build system doesn't allow output to go to arbitrary places.
+test = TestGyp.TestGyp(formats=['!android'])
 test.run_gyp('copies-updir.gyp', chdir='src')
 test.relocate('src', 'relocate/src')
 test.build('copies-updir.gyp', 'copies_up', chdir='relocate/src')
diff --git a/test/escaping/gyptest-colon.py b/test/escaping/gyptest-colon.py
index 610f00e4..f5275db6 100644
--- a/test/escaping/gyptest-colon.py
+++ b/test/escaping/gyptest-colon.py
@@ -14,7 +14,7 @@ import sys
 import TestGyp
 
 # TODO: Make colons in filenames work with make, if required.
-test = TestGyp.TestGyp(formats=['!make'])
+test = TestGyp.TestGyp(formats=['!make', '!android'])
 CHDIR = 'colon'
 
 source_name = 'colon/a:b.c'
diff --git a/test/gyp-defines/gyptest-multiple-values.py b/test/gyp-defines/gyptest-multiple-values.py
index a659ad8a..7c382575 100644
--- a/test/gyp-defines/gyptest-multiple-values.py
+++ b/test/gyp-defines/gyptest-multiple-values.py
@@ -27,6 +27,12 @@ if test.format == 'msvs' and not test.uses_msbuild:
   # msvs versions before 2010 don't detect build rule changes not reflected
   # in file system timestamps. Rebuild to see differences.
   test.build('defines.gyp', rebuild=True)
+elif test.format == 'android':
+  # The Android build system doesn't currently have a way to get files whose
+  # build rules have changed (but whose timestamps haven't) to be rebuilt.
+  # See bug http://code.google.com/p/gyp/issues/detail?id=308
+  test.unlink('action.txt')
+  test.build('defines.gyp')
 else:
   test.build('defines.gyp')
 test.must_contain('action.txt', 'repeated_value')
diff --git a/test/rename/filecase/file.c b/test/rename/filecase/file.c
index 237c8ce1..76e81970 100644
--- a/test/rename/filecase/file.c
+++ b/test/rename/filecase/file.c
@@ -1 +1 @@
-int main() {}
+int main() { return 0; }
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()