commit 85408ef2daaf6149baf0f03d69d9376dbc8d8c54
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 02 22:25:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 02 22:25:59 2017 +0000
tree 18864ecc3d51137549bedfb7c7090a8b2addf8ca
parent 5c7107434bfd3f937c626e506ed00238fe27ee18
parent 2d3122c90b58655cc44c9e7b9461b9de3daccb2e

Merge "Fix test compile errors after LLVM rebase"

tests/fortify_test.cpp

diff --git a/tests/fortify_test.cpp b/tests/fortify_test.cpp
index 2e0f822..984a657 100644
--- a/tests/fortify_test.cpp
+++ b/tests/fortify_test.cpp
@@ -405,11 +405,8 @@
   ASSERT_FORTIFY(sprintf(buf, "%s", source_buf));
 }
 
-#ifdef __clang__
-// Exists upstream, but hasn't been pulled in yet.
-#if __has_attribute(alloc_size)
-#error "Reenable this test"
-#endif
+#ifdef __clang__ && !__has_attribute(alloc_size)
+// TODO: remove this after Clang prebuilt rebase.
 #else
 // This test is disabled in clang because clang doesn't properly detect
 // this buffer overflow. TODO: Fix clang.

tests/libs/bionic_tests_zipalign.cpp

diff --git a/tests/libs/bionic_tests_zipalign.cpp b/tests/libs/bionic_tests_zipalign.cpp
index 8e31474..56183ba 100644
--- a/tests/libs/bionic_tests_zipalign.cpp
+++ b/tests/libs/bionic_tests_zipalign.cpp
@@ -142,7 +142,7 @@
   if (return_value != 0) {
     CloseArchive(handle);
     fprintf(stderr, "Unable to open '%s': %s\n", argv[2], ErrorCodeString(return_value));
-    return false;
+    return 1;
   }
 
   FILE* zip_dst = fopen(argv[3], "we");