fix: test-262 compile error

OpenQuickJS · Jun 12, 2023 · 6d26d96 · 6d26d96
1 parent 821ec8d
commit 6d26d96
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,6 +2,11 @@
     "cmake.sourceDirectory": "${workspaceFolder}",
     "cmake.cmakePath": "/usr/local/bin/cmake",
     "files.associations": {
-        "js-array.h": "c"
+        "*.ux": "vue",
+        "*.mdx": "markdown",
+        "js-array.h": "c",
+        "quickjs-libc.h": "c",
+        "cutils.h": "c",
+        "list.h": "c"
     }
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,6 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
 set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
 
 # include c headers
-include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/include)
 include_directories(${PROJECT_SOURCE_DIR}/vendor/mimalloc/include)
 add_subdirectory(src)
@@ -70,7 +69,7 @@ target_link_libraries(qjs quickjs ${LINK_LIBRARIES} mimalloc-static)
 
 # build run-test262 (quickjs test262 runner)
 add_executable(run-test262
-        src/tests/run-test262.c
+        src/cli/run-test262.c
         src/cli/quickjs-libc.c
 )
 target_link_libraries(run-test262 quickjs ${LINK_LIBRARIES} mimalloc-static)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,3 +1,4 @@
+# config build target: "Debug" or "Release"
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(COMPILE_FLAGS ${COMPILE_FLAGS} -g)
 elseif(CMAKE_BUILD_TYPE STREQUAL "Release")

diff --git a/src/cli/qjs.c b/src/cli/qjs.c
@@ -34,7 +34,7 @@
 #include <time.h>
 
 #include "mimalloc.h"
-#include "include/quickjs/cutils.h"
+#include "quickjs/cutils.h"
 #include "quickjs-libc.h"
 
 extern const uint8_t qjsc_repl[];

diff --git a/src/cli/quickjs-libc.c b/src/cli/quickjs-libc.c
@@ -68,8 +68,8 @@ typedef sig_t sighandler_t;
 #endif
 
 #include "mimalloc.h"
-#include "include/quickjs/cutils.h"
-#include "include/quickjs/list.h"
+#include "quickjs/cutils.h"
+#include "quickjs/list.h"
 #include "quickjs-libc.h"
 
 /* TODO:

diff --git a/src/cli/quickjs-libc.h b/src/cli/quickjs-libc.h
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "include/quickjs/quickjs.h"
+#include "quickjs/quickjs.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/tests/run-test262.c → src/cli/run-test262.c b/src/tests/run-test262.c → src/cli/run-test262.c
@@ -36,8 +36,8 @@
 #include <ftw.h>
 
 #include "mimalloc.h"
-#include "include/quickjs/cutils.h"
-#include "include/quickjs/list.h"
+#include "quickjs/cutils.h"
+#include "quickjs/list.h"
 #include "quickjs-libc.h"
 
 /* enable test262 thread support to test SharedArrayBuffer and Atomics */