Fix build and test using bionic as a libc

There's a flag to Soong in order to use bionic as a libc instead of
glibc, removing dependencies on your host system. This fixes a single
include what you use, and some error message differences.

2 files changed, 3 insertions, 0 deletions

diff --git a/exec.cc b/exec.cc
index 1569519..fa534d5 100644
--- a/exec.cc
+++ b/exec.cc
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/wait.h>
 
 #include <memory>
 #include <unordered_map>
diff --git a/runtest.rb b/runtest.rb
index 190c11f..7bc552d 100755
--- a/runtest.rb
+++ b/runtest.rb
@@ -177,6 +177,8 @@ def normalize_kati_log(output)
   # Normalization for "include foo" with Go kati.
   output.gsub!(/(: )open (\S+): n(o such file or directory)\nNOTE:.*/,
                "\\1\\2: N\\3")
+  # Bionic libc has different error messages than glibc
+  output.gsub!(/Too many symbolic links encountered/, 'Too many levels of symbolic links')
   output
 end