Merge pull request #145 from seq-lang/develop

Develop

Author: arshajii

CMakeLists.txt

@@ -25,7 +25,7 @@ ExternalProject_Add(bdwgc
   URL https://github.com/ivmai/bdwgc/releases/download/v8.0.4/gc-8.0.4.tar.gz
   SOURCE_DIR ${CMAKE_BINARY_DIR}/bdwgc
   CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/bdwgc/configure CFLAGS=-fPIC --enable-threads=posix --enable-cplusplus --enable-thread-local-alloc --enable-large-config --prefix=${CMAKE_BINARY_DIR}/bdwgc/build
-  BUILD_COMMAND make LDFLAGS=-static
+  BUILD_COMMAND make CFLAGS=-DHANDLE_FORK LDFLAGS=-static
   BUILD_IN_SOURCE ON
   INSTALL_DIR ${CMAKE_BINARY_DIR}/bdwgc/build
   INSTALL_COMMAND make install
@@ -174,6 +174,7 @@ add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
                  EXCLUDE_FROM_ALL)
 
 add_executable(seqtest test/main.cpp)
+target_include_directories(seqtest PRIVATE ${BDWGC_DIR}/include)
 target_link_libraries(seqtest seq gtest_main)
 target_compile_definitions(seqtest PRIVATE TEST_DIR="${CMAKE_CURRENT_SOURCE_DIR}/test")
 

test/main.cpp

@@ -2,6 +2,7 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <fstream>
+#include <gc.h>
 #include <iostream>
 #include <sstream>
 #include <string>
@@ -36,9 +37,11 @@ class SeqTest : public testing::TestWithParam<
     const bool debug = get<1>(GetParam());
     assert(pipe(out_pipe) != -1);
     pid = fork();
+    GC_atfork_prepare();
     assert(pid != -1);
 
     if (pid == 0) {
+      GC_atfork_child();
       dup2(out_pipe[1], STDOUT_FILENO);
       close(out_pipe[0]);
       close(out_pipe[1]);
@@ -48,6 +51,7 @@ class SeqTest : public testing::TestWithParam<
       fflush(stdout);
       exit(EXIT_SUCCESS);
     } else {
+      GC_atfork_parent();
       int status = -1;
       close(out_pipe[1]);
       assert(waitpid(pid, &status, 0) == pid);