Merge "Move shared parts of the two printfs out."
diff --git a/tests/Android.bp b/tests/Android.bp
index 66d9aec..6ec3c3c 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -96,7 +96,6 @@
         "nl_types_test.cpp",
         "pthread_test.cpp",
         "pty_test.cpp",
-        "qsort_test.cpp",
         "regex_test.cpp",
         "resolv_test.cpp",
         "sched_test.cpp",
diff --git a/tests/qsort_test.cpp b/tests/qsort_test.cpp
deleted file mode 100644
index 95b4789..0000000
--- a/tests/qsort_test.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdlib.h>
-#include <sys/types.h>
-
-#include <gtest/gtest.h>
-
-#include "gtest_globals.h"
-
-#define BUFFER_SIZE 1024
-
-static int cmp_long(const void *l, const void *r)
-{
-
-  return (*(long *)l - *(long *)r);
-}
-
-static int cmp_int(const void *l, const void *r)
-{
-
-  return (*(int *)l - *(int *)r);
-}
-
-#ifndef arc4random_uniform
-static bool seeded;
-
-u_int32_t arc4random_uniform(uint32_t upper_bound)
-{
-  if (!seeded) {
-    srandom((int)time(NULL));
-    seeded = true;
-  }
-
-  return (random() % upper_bound);
-}
-#endif
-
-TEST(qsort_test, long_test) {
-  long buf[BUFFER_SIZE];
-  long i;
-
-  /* Initialize buffer with known numbers */
-  for (i=0; i<BUFFER_SIZE; i++)
-    buf[i] = i;
-
-  /* Stir 1/4 pairs in the buffer */
-  for (i=0; i<BUFFER_SIZE/4; i++) {
-    u_int32_t pos1, pos2;
-    long t;
-
-    pos1 = arc4random_uniform(BUFFER_SIZE);
-    pos2 = arc4random_uniform(BUFFER_SIZE);
-
-    t = buf[pos1];
-    buf[pos1] = buf[pos2];
-    buf[pos2] = t;
-  }
-
-  /* Sort */
-  qsort(buf, BUFFER_SIZE, sizeof(buf[0]), &cmp_long);
-
-  for (i=0; i<BUFFER_SIZE; i++)
-    EXPECT_EQ(i, buf[i]);
-}
-
-TEST(qsort_test, int_test) {
-  int buf[BUFFER_SIZE];
-  int i;
-
-  /* Initialize buffer with known numbers */
-  for (i=0; i<BUFFER_SIZE; i++)
-    buf[i] = i;
-
-  /* Stir 1/4 pairs in the buffer */
-  for (i=0; i<BUFFER_SIZE/4; i++) {
-    u_int32_t pos1, pos2;
-    int t;
-
-    pos1 = arc4random_uniform(BUFFER_SIZE);
-    pos2 = arc4random_uniform(BUFFER_SIZE);
-
-    t = buf[pos1];
-    buf[pos1] = buf[pos2];
-    buf[pos2] = t;
-  }
-
-  /* Sort */
-  qsort(buf, BUFFER_SIZE, sizeof(buf[0]), &cmp_int);
-
-  for (i=0; i<BUFFER_SIZE; i++)
-    EXPECT_EQ(i, buf[i]);
-}
diff --git a/tests/resolv_test.cpp b/tests/resolv_test.cpp
index 08f9d90..f1d82e4 100644
--- a/tests/resolv_test.cpp
+++ b/tests/resolv_test.cpp
@@ -42,3 +42,19 @@
   uint8_t buf[128];
   ASSERT_EQ(128, b64_pton(data, buf, sizeof(buf)));
 }
+
+TEST(resolv, b64_ntop) {
+  char buf[128];
+  memset(buf, 'x', sizeof(buf));
+  ASSERT_EQ(static_cast<int>(strlen("aGVsbG8=")),
+            b64_ntop(reinterpret_cast<u_char const*>("hello"), strlen("hello"),
+                     buf, sizeof(buf)));
+  ASSERT_STREQ(buf, "aGVsbG8=");
+}
+
+TEST(resolv, b64_pton) {
+  u_char buf[128];
+  memset(buf, 'x', sizeof(buf));
+  ASSERT_EQ(static_cast<int>(strlen("hello")), b64_pton("aGVsbG8=", buf, sizeof(buf)));
+  ASSERT_STREQ(reinterpret_cast<char*>(buf), "hello");
+}
diff --git a/tests/stdlib_test.cpp b/tests/stdlib_test.cpp
index 27495d8..0c40380 100644
--- a/tests/stdlib_test.cpp
+++ b/tests/stdlib_test.cpp
@@ -508,6 +508,16 @@
   close(fd);
 }
 
+TEST(stdlib, ttyname) {
+  int fd = getpt();
+  ASSERT_NE(-1, fd);
+
+  // ttyname returns "/dev/ptmx" for a pty.
+  ASSERT_STREQ("/dev/ptmx", ttyname(fd));
+
+  close(fd);
+}
+
 TEST(stdlib, ttyname_r) {
   int fd = getpt();
   ASSERT_NE(-1, fd);
diff --git a/tools/versioner/src/Android.bp b/tools/versioner/src/Android.bp
index b86228f..9151646 100644
--- a/tools/versioner/src/Android.bp
+++ b/tools/versioner/src/Android.bp
@@ -16,8 +16,8 @@
     ],
 
     shared_libs: [
-        "libclang",
-        "libLLVM",
+        "libclang_android",
+        "libLLVM_android",
         "libbase",
     ],