commit 01250f2a144846b493cf5cf8f5311b1bf3fe6c19
author Ed Tanous <ed.tanous@intel.com> Tue Apr 18 17:49:51 2017 -0700
committer Ed Tanous <ed.tanous@intel.com> Tue Apr 18 17:49:51 2017 -0700
tree 429f8011d5245f28c948e3ea346a6e7fd494f0ca
parent b078cf37df19e1e2610c07002a63562e0e24edb4

incremental

src/getvideo_main.cpp

diff --git a/src/getvideo_main.cpp b/src/getvideo_main.cpp
index ad002c3..cd7f09c 100644
--- a/src/getvideo_main.cpp
+++ b/src/getvideo_main.cpp
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define BUILD_CIMG
+//#define BUILD_CIMG
 #ifdef BUILD_CIMG
 #define cimg_display 0
 #include <CImg.h>

src/msan_test.cpp

diff --git a/src/msan_test.cpp b/src/msan_test.cpp
new file mode 100644
index 0000000..047d3cf
--- /dev/null
+++ b/src/msan_test.cpp
@@ -0,0 +1,7 @@
+#include "gtest/gtest.h"
+#include <string>
+
+TEST(MemorySanitizer, TestIsWorking) {
+  std::string foo("foo");
+  EXPECT_STREQ("foo", foo.c_str());
+}

src/ssl_key_handler_test.cpp

diff --git a/src/ssl_key_handler_test.cpp b/src/ssl_key_handler_test.cpp
new file mode 100644
index 0000000..818137c
--- /dev/null
+++ b/src/ssl_key_handler_test.cpp
@@ -0,0 +1 @@
+// TODO(ed) WRITE TESTS FOR THIS
\ No newline at end of file

src/webserver_main.cpp

diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp
index 949bdc1..d77d822 100644
--- a/src/webserver_main.cpp
+++ b/src/webserver_main.cpp
@@ -1,7 +1,3 @@
-#include <web_kvm.hpp>
-#include <webassets.hpp>
-#include "ssl_key_handler.hpp"
-
 #include "crow/app.h"
 #include "crow/ci_map.h"
 #include "crow/common.h"
@@ -38,6 +34,10 @@
 #include <string>
 #include <unordered_set>
 
+#include <web_kvm.hpp>
+#include <webassets.hpp>
+#include "ssl_key_handler.hpp"
+
 int main(int argc, char** argv) {
   auto worker(g3::LogWorker::createLogWorker());
   std::string logger_name("bmcweb");
@@ -116,8 +116,7 @@
         conn.send_binary(str);
 
       });
-
-  app.port(18080)
-      //.ssl(std::move(ensuressl::get_ssl_context(ssl_pem_file)))
-      .run();
+  auto ssl_context = ensuressl::get_ssl_context(ssl_pem_file);
+  app.port(18080).ssl(std::move(ssl_context)).run();
 }
+