auto import from //branches/cupcake/...@132276

diff --git a/tests/bionic/libc/Android.mk b/tests/bionic/libc/Android.mk
index 14ac0c0..f9b04fd 100644 (file)
--- a/tests/bionic/libc/Android.mk
+++ b/tests/bionic/libc/Android.mk
@@ -105,10 +105,35 @@ sources := \
     other/test_system.c \
     other/test_thread_max.c \
     other/test_timer_create.c \
+    other/test_timer_create2.c \
     other/test_vfprintf_leak.c \
 
 $(call device-test, $(sources))
 
+# The relocations test is a bit special, since we need
+# to build one shared object and one executable that depends
+# on it.
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := bionic/lib_relocs.c
+LOCAL_MODULE    := libtest_relocs
+LOCAL_PRELINK_MODULE := false
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := bionic/test_relocs.c
+LOCAL_MODULE    := test_relocs
+LOCAL_SHARED_LIBRARIES := libtest_relocs
+include $(BUILD_EXECUTABLE)
+
 # TODO: Add a variety of GLibc test programs too...
 
+# Hello World to test libstdc++ support
+
+sources := \
+    common/hello_world.cpp \
+
+EXTRA_CFLAGS := -mandroid
+#$(call device-test, $(sources))
+
 endif  # BIONIC_TESTS

diff --git a/tests/bionic/libc/bionic/lib_relocs.c b/tests/bionic/libc/bionic/lib_relocs.c
new file mode 100644 (file)
index 0000000..af4cf6f
--- /dev/null
+++ b/tests/bionic/libc/bionic/lib_relocs.c
@@ -0,0 +1,19 @@
+/* this is part of the test_relocs.c test, which is used to check that
+ * the relocations generated in a shared object are properly handled
+ * by the Bionic dynamic linker
+ */
+
+struct foo { int first, second; };
+struct foo Foo = {1, 2};
+
+int* FooPtr[] = { &Foo.first, &Foo.second };
+
+int func1( void )
+{
+    return *FooPtr[0];
+}
+
+int  func2( void )
+{
+    return *FooPtr[1];
+}

diff --git a/tests/bionic/libc/bionic/test_relocs.c b/tests/bionic/libc/bionic/test_relocs.c
new file mode 100644 (file)
index 0000000..c42df11
--- /dev/null
+++ b/tests/bionic/libc/bionic/test_relocs.c
@@ -0,0 +1,25 @@
+/* this little test is written to check that the relocations generated
+ * in a shared library are correct. it depends on the content of lib_relocs.c
+ * being compiled as a shared object.
+ */
+#include <stdio.h>
+
+extern int  func1(void);
+extern int  func2(void);
+
+int
+main( void )
+{
+    int   f1, f2, expect1 = 1, expect2 = 2;
+
+    f1 = func1();
+    f2 = func2();
+
+    printf( "func1() returns %d: %s\n", f1, (f1 == expect1) ? "OK" : "FAIL" );
+    printf( "func2() returns %d: %s\n", f2, (f2 == expect2) ? "OK" : "FAIL" );
+
+    if (f1 != expect1 || f2 != expect2)
+        return 1;
+
+    return 0;
+}

diff --git a/tests/bionic/libc/common/hello_world.cpp b/tests/bionic/libc/common/hello_world.cpp
new file mode 100644 (file)
index 0000000..0578d7d
--- /dev/null
+++ b/tests/bionic/libc/common/hello_world.cpp
@@ -0,0 +1,8 @@
+#include <iostream>
+using namespace std;
+
+int  main()
+{
+    cout << "Hello World" << endl;
+    return 0;
+}

diff --git a/tests/bionic/libc/other/test_timer_create2.c b/tests/bionic/libc/other/test_timer_create2.c
new file mode 100644 (file)
index 0000000..10e95e4
--- /dev/null
+++ b/tests/bionic/libc/other/test_timer_create2.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the 
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <stdio.h>
+#include <time.h>
+#include <signal.h>
+#include <pthread.h>
+#include <string.h>
+#include <unistd.h>
+
+void
+handle(int v)
+{
+    time_t  t;
+    char    p[32];
+
+    time(&t);
+    strftime(p, sizeof(p), "%T", localtime(&t));
+    printf("%s thread %p, val = %d, signal captured.\n", 
+            p,  pthread_self(), v);
+    return;
+}
+
+int
+create(int seconds, int id)
+{
+    timer_t tid;
+    struct sigevent se;
+    struct itimerspec ts, ots;
+
+    memset(&se, 0, sizeof (se));
+    se.sigev_notify = SIGEV_SIGNAL;
+    se.sigev_signo  = SIGUSR1;
+
+    if (timer_create (CLOCK_REALTIME, &se, &tid) < 0)
+    {
+        perror ("timer_creat");
+        return -1;
+    }
+    printf("timer_create successfully = %d.\n", (int)tid);
+    ts.it_value.tv_sec = 3;
+    ts.it_value.tv_nsec = 0;
+    ts.it_interval.tv_sec = seconds;
+    ts.it_interval.tv_nsec = 0;
+    if (timer_settime (tid, TIMER_ABSTIME, &ts, &ots) < 0)
+    {
+        perror ("timer_settime");
+        return -1;
+    }
+    return 0;
+}
+
+int
+main (void)
+{
+    sigset_t          mask[1];
+    struct sigaction  act[1];
+
+    sigemptyset(mask);
+    sigaddset(mask, SIGUSR1);
+    sigprocmask(SIG_UNBLOCK,mask,NULL);
+
+    memset(act, 0, sizeof(*act));
+    act->sa_handler = handle;
+    sigaction( SIGUSR1, act, NULL );
+
+    printf("main thread is %p\n", pthread_self());
+
+    if (create (3, 1) < 0) return 1;
+    if (create (5, 2) < 0) return 1;
+    for (;;)
+    {
+        sleep (10);
+    }
+    return 0;
+}