Convert tests and the test harness to gtest.

Author: dvander

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "third_party/googletest"]
+	path = third_party/googletest
+	url = https://github.com/google/googletest

AMBuildScript

@@ -154,6 +154,11 @@ class KEConfig(object):
     binary = compiler.Program(name)
     return binary
 
+  def StaticLibrary(self, context, name):
+    compiler = context.compiler.clone()
+    binary = compiler.StaticLibrary(name)
+    return binary
+
 KE = KEConfig()
 KE.configure()
 

tests/AMBuild.tests

@@ -18,17 +18,29 @@
 #
 import os
 
+binary = KE.StaticLibrary(builder, 'libgtest')
+binary.compiler.includes += [
+  os.path.join(builder.sourcePath, 'third_party', 'googletest', 'googletest', 'include'),
+  os.path.join(builder.sourcePath, 'third_party', 'googletest', 'googletest'),
+]
+binary.sources += [
+  os.path.join('..', 'third_party', 'googletest', 'googletest', 'src', 'gtest-all.cc'),
+]
+libgtest = builder.Add(binary)
+
 binary = KE.Program(builder, 'testrunner')
 compiler = binary.compiler
 compiler.includes += [
   os.path.join(builder.sourcePath, 'amtl'),
   os.path.join(builder.sourcePath),
+  os.path.join(builder.sourcePath, 'third_party', 'googletest', 'googletest', 'include'),
 ]
 
 if compiler.like('msvc'):
   compiler.linkflags.append('/SUBSYSTEM:CONSOLE')
 if builder.target_platform == 'linux':
   compiler.linkflags.append('-ldl')
+compiler.linkflags.append(libgtest.binary)
 
 binary.sources += [
   'main.cpp',

tests/main.cpp

@@ -31,29 +31,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gtest/gtest.h>
 #include "runner.h"
 
 using namespace ke;
 
-Test* Test::head = nullptr;
-
 int main(int argc, char** argv)
 {
-  Test* test = Test::first();
-  while (test) {
-    if (argc >= 2 && strcmp(argv[1], test->name()) != 0) {
-      test = test->next();
-      continue;
-    }
-    fprintf(stdout, "Testing %s... \n", test->name());
-    if (!test->Run()) {
-      fprintf(stdout, "TEST:%s FAIL\n", test->name());
-      return 1;
-    }
-    fprintf(stdout, "TEST:%s OK\n", test->name());
-    test = test->next();
-  }
-  return 0;
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
 }
 
 #if defined(__GNUC__)

tests/runner.h

@@ -37,67 +37,6 @@
 
 namespace ke {
 
-class Test
-{
- public:
-  Test(const char* name)
-   : name_(name),
-     next_(head)
-  {
-    head = this;
-  }
-
-  virtual bool Run() = 0;
-
-  const char* name() const {
-    return name_;
-  }
-  Test* next() const {
-    return next_;
-  }
-
-  static inline Test* first() {
-    return head;
-  }
-
- private:
-  static Test* head;
-
- private:
-  const char* name_;
-  Test* next_;
-};
-
-static inline bool
-check(bool condition, const char* fmt, ...)
-{
-  FILE* fp = condition ? stdout : stderr;
-  if (condition)
-    fprintf(fp, " -- Ok: ");
-  else
-    fprintf(fp, " -- Failure: ");
-  va_list ap;
-  va_start(ap, fmt);
-  vfprintf(fp, fmt, ap);
-  va_end(ap);
-  fprintf(fp, "\n");
-  return condition;
-}
-
-static inline bool
-check_silent(bool condition, const char* fmt, ...)
-{
-  if (condition)
-    return true;
-  fprintf(stderr, " -- Failure: ");
-  va_list ap;
-  va_start(ap, fmt);
-  vfprintf(stderr, fmt, ap);
-  va_end(ap);
-  fprintf(stderr, "\n");
-  return false;
-}
-
 class FallibleMalloc
 {
  public:
@@ -149,7 +88,7 @@ class FallibleMalloc
   size_t overflows_;
 };
 
-}
+} // namespace ke
 
 #endif // _include_amtl_runner_h_