Merge pull request #2353 from MagnusS/fix-http-test

Fix http linking and enable http test

Author: alfreb

cmake/os.cmake

@@ -177,6 +177,7 @@ function(os_add_executable TARGET NAME)
     ${INCLUDEOS_PACKAGE}/lib/libos.a
     ${INCLUDEOS_PACKAGE}/libcxx/lib/libc++.a
     ${INCLUDEOS_PACKAGE}/libc/lib/libc.a
+    ${INCLUDEOS_PACKAGE}/http-parser/lib/libhttp_parser.a
     ${INCLUDEOS_PACKAGE}/lib/libmusl_syscalls.a
     ${INCLUDEOS_PACKAGE}/libunwind/lib/libunwind.a
     ${INCLUDEOS_PACKAGE}/libgcc/lib/linux/${LIBGCC}

deps/http-parser/default.nix

@@ -89,7 +89,6 @@ final: prev: {
     # Deps
     botan2 = self.callPackage ./deps/botan/default.nix { };
     libfmt = self.callPackage ./deps/libfmt/default.nix { };
-    http-parser = self.callPackage ./deps/http-parser/default.nix { };
     s2n-tls = self.callPackage ./deps/s2n/default.nix { };
     uzlib = self.callPackage ./deps/uzlib/default.nix { };
 
@@ -161,7 +160,7 @@ final: prev: {
       buildInputs = [
         self.libfmt
         self.botan2
-        self.http-parser
+        prev.pkgsStatic.http-parser
         prev.pkgsStatic.openssl
         prev.pkgsStatic.rapidjson
         #self.s2n-tls          👈 This is postponed until we can fix the s2n build.
@@ -179,6 +178,7 @@ final: prev: {
         cp -r -v ${final.stdenvIncludeOS.libraries.libcxx.include} $out/libcxx/include
         cp -r -v ${final.stdenvIncludeOS.libraries.libunwind} $out/libunwind
         cp -r -v ${final.stdenvIncludeOS.libraries.libgcc} $out/libgcc
+        cp -r -v ${final.pkgsStatic.http-parser} $out/http-parser
       '';
 
       archFlags = if self.stdenv.targetPlatform.system == "i686-linux" then
@@ -206,7 +206,6 @@ final: prev: {
 
       passthru = {
         inherit (self) uzlib;
-        inherit (self) http-parser;
         inherit (self) botan2;
         inherit (self) libfmt;
         #inherit (self) s2n-tls;

overlay.nix

@@ -88,7 +88,7 @@ void Service::ready()
       printf("Error: %s \n", err.to_string().c_str());
 
     CHECKSERT(!err, "No error");
-    printf("Received body: %s\n", res->body());
+    printf("Received body: %.*s\n", static_cast<int>(res->body().length()), res->body().data());
     CHECKSERT(res->body() == "/testing", "Received body: \"/testing\"");
 
     printf("SUCCESS\n");

test/integration/net/http/service.cpp

@@ -238,7 +238,6 @@ exclusions=(
   "dhcpd"     # Times out, requires certain routes to be set up. Seems easy.
   "dhcpd_dhclient_linux" # We can't run userspace tests with this setup yet.
   "gateway"   # Requires NaCl which is currently not integrated
-  "http"      # Linking fails, undefined ref to http_parser_parse_url, http_parser_execute
   "microLB"   # Missing dependencies: microLB, diskbuilder, os_add_os_library
   "nat"       # Times out after 3 / 6 tests seem to pass. Might be a legit bug here.
   "router"    # Times out, requies sudo and has complex network setup.
@@ -258,6 +257,7 @@ unsandbox_list=(
   "${INTEGRATION_TESTS}/net/tcp"
   "${INTEGRATION_TESTS}/net/udp"
   "${INTEGRATION_TESTS}/net/dns"  # except this one which times out instead
+  "${INTEGRATION_TESTS}/net/http"
 )
 run_testsuite "${INTEGRATION_TESTS}/net" "${exclusions[@]}"
 unsandbox_list=()