fix broken tests

sebbekarlsson · May 4, 2023 · e2feed3 · e2feed3
1 parent 04a2671
commit e2feed3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/compile_and_test.yml b/.github/workflows/compile_and_test.yml
@@ -16,4 +16,4 @@ jobs:
       #- name: install dependencies
       #run: sudo apt-get update -y && sudo apt-get install --yes libcmocka-dev libcmocka0
     - name: tests
-      run: git submodule update; git submodule sync; cd tests && make && ./a.out
+      run: git submodule update; git submodule sync; mkdir -p build && cd build && cmake .. && make && cd tests && ./gpp_test
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,6 +74,4 @@ init_gpp_deps(gpp)
 init_gpp_deps(gpp_static)
 init_gpp_deps(gpp_e)
 
-if (UNIT_TEST)
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests)
-endif()
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/inputs DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/context.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 
 set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules")
 
@@ -17,6 +18,9 @@ message(${source_files})
 add_executable(gpp_test ${source_files})
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include)
+
+include(FetchContent)
 
 include(gpp_deps)
 

diff --git a/tests/src/test_inputs.c b/tests/src/test_inputs.c
@@ -3,14 +3,21 @@
 #include "include/utils.h"
 #include <string.h>
 
+
+//gpp_result_T *gpp_eval(char *source, unsigned int lazy, AST_T *parent,
+//                     AST_T *context, GPPEnv* env, GPPEnv* global_env);
+
 void test_inputs(char* argv[]) {
 
+
+  const char* filepath = "inputs/tmp.html";
   GPPEnv env = (GPPEnv){ .base_path = "inputs" };
+  GPPEnv global_env = (GPPEnv){ .base_path = filepath };
 
   {
     printf("Running test: hello-world.html\n");
     gpp_result_T *res =
-      gpp_eval(gpp_read_file("inputs/hello-world.html"), 0, 0, 0, &env);
+      gpp_eval(gpp_read_file("inputs/hello-world.html"), 0, 0, 0, &env, &global_env);
 
 
     test_assert(!!res->res, "res->res exists");
@@ -21,7 +28,7 @@ void test_inputs(char* argv[]) {
   {
     printf("Running test: arrow-function.html\n");
     gpp_result_T *res =
-        gpp_eval(gpp_read_file("inputs/arrow-function.html"), 0, 0, 0, &env);
+      gpp_eval(gpp_read_file("inputs/arrow-function.html"), 0, 0, 0, &env, &global_env);
     test_assert(!!res->res, "res->res exists");
     test_assert(strcmp(res->res, "<li>hello</li><li>world</li>") == 0,
                 "Receives correct output");
@@ -30,7 +37,7 @@ void test_inputs(char* argv[]) {
   {
     printf("Running test: map-context.html\n");
     gpp_result_T *res =
-        gpp_eval(gpp_read_file("inputs/map-context.html"), 0, 0, 0, &env);
+      gpp_eval(gpp_read_file("inputs/map-context.html"), 0, 0, 0, &env, &global_env);
     test_assert(!!res->res, "res->res exists");
     test_assert(strcmp(res->res, "<li>Not</li>\n"
                                  "<li>Made</li>\n"
@@ -46,7 +53,7 @@ void test_inputs(char* argv[]) {
 
   {
     printf("Running test: escape.html\n");
-    gpp_result_T *res = gpp_eval(gpp_read_file("inputs/escape.html"), 0, 0, 0, &env);
+    gpp_result_T *res = gpp_eval(gpp_read_file("inputs/escape.html"), 0, 0, 0, &env, &global_env);
     test_assert(!!res->res, "res->res exists");
     test_assert(strcmp(res->res, "&lt;h1&gt;Hello&lt;/h1&gt;") == 0,
                 "Receives correct output");