commit 3e898476c7230b60a0f76968e64ff25f475b48c0
author Elliott Hughes <enh@google.com> Tue Feb 12 16:40:24 2013 +0000
committer Elliott Hughes <enh@google.com> Tue Feb 12 15:27:18 2013 -0800
tree 0f876aeb565b7e7ac627a6305a355c40173912f2
parent fcaf4e9f9b735e053469c7ecbf63584e10fd67a7

Revert "Revert "More pthreads cleanup.""

This reverts commit 6f94de3ca49e4ea147b1c59e5818fa175846518f

(Doesn't try to increase the number of TLS slots; that leads to
an inability to boot. Adds more tests.)

Change-Id: Ia7d25ba3995219ed6e686463dbba80c95cc831ca

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 3217a4d..8138cff 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -124,6 +124,7 @@
 # implementation for testing the tests themselves.
 ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
 include $(CLEAR_VARS)
+LOCAL_CXX := /usr/bin/g++ # Avoid the host prebuilt so we test the real glibc.
 LOCAL_MODULE := bionic-unit-tests-glibc
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_CFLAGS += $(test_c_flags)