build: fix github action

.github/workflows/test.yml

@@ -15,17 +15,13 @@ jobs:
           platform: x64
 
       - name: Setup Cmake
-        uses: aminya/install-cmake@master
-        with:
-          cmake: 3.25.1
-          ninja: 1.11.1
+        uses: lukka/get-cmake@latest
 
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Test
-        run: |
-          mkdir build && cd build 
-          cmake .. --fresh -G Ninja -DCMAKE_BUILD_TYPE=Release 
-          ninja tests && ctest --test-dir tests --output-on-failure
-        shell: bash
+      - name: Run Tests
+        uses: lukka/run-cmake@v10
+        with:
+          configurePreset: "default"
+          buildPreset: "run-tests"

.vscode/settings.json

@@ -16,6 +16,7 @@
     "BIGNUM",
     "bjson",
     "bugprone",
+    "buildsystems",
     "BYTECODE",
     "Casefolded",
     "Casemapped",

CMakePresets.json

@@ -0,0 +1,63 @@
+{
+	"version": 6,
+	"cmakeMinimumRequired": {
+		"major": 3,
+		"minor": 24,
+		"patch": 0
+	},
+	"configurePresets": [
+		{
+			"name": "default",
+			"displayName": "Default Config",
+			"description": "Default build using Ninja generator",
+			"generator": "Ninja Multi-Config",
+			"binaryDir": "${sourceDir}/build/",
+			"cacheVariables": {
+				"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_INSTALLED_DIR}/scripts/buildsystems/vcpkg.cmake"
+			},
+			"environment": {},
+			"vendor": {}
+		},
+		{
+			"name": "qjs:debugger",
+			"description": "Compile qjs with debugger support",
+			"inherits": "default",
+			"cacheVariables": {
+				"QJS_CONFIG_DEBUGGER": "y"
+			}
+		}
+	],
+	"buildPresets": [
+		{
+			"name": "qjs:debugger",
+			"description": "Run qjs with debugger support",
+			"configurePreset": "qjs:debugger",
+			"targets": [
+				"qjs"
+			]
+		},
+		{
+			"name": "run-tests",
+			"configurePreset": "default",
+			"targets": [
+				"run-tests"
+			]
+		},
+		{
+			"name": "run-microbench",
+			"configurePreset": "default",
+			"targets": [
+				"microbench"
+			],
+			"configuration": "Release"
+		},
+		{
+			"name": "run-test262",
+			"configurePreset": "default",
+			"targets": [
+				"run-test262-test2"
+			],
+			"configuration": "Release"
+		}
+	]
+}

qjs/CMakeLists.txt

@@ -22,7 +22,7 @@ target_compile_definitions(qjs PRIVATE CONFIG_VERSION="${CONFIG_VERSION}")
 # generated by the qjsc
 add_dependencies(qjs qjsc)
 
-set(QJSC "${PROJECT_BINARY_DIR}/qjsc/qjsc")
+set(QJSC "$<TARGET_FILE:qjsc>")
 
 add_custom_command(
   OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/repl.c"

qjs/qjs.c

@@ -169,7 +169,7 @@ static void
       /* only handle %p and %zd */
       if (*fmt == 'p') {
         uint8_t *ptr = (uint8_t *)va_arg(ap, void *);
-        if (ptr == nullptr) {
+        if (ptr == NULL) {
           printf("NULL");
         } else {
           printf("H%+06lld.%zd",
@@ -203,7 +203,7 @@ static void *js_trace_malloc(JSMallocState *s, size_t size) {
   assert(size != 0);
 
   if (unlikely(s->malloc_size + size > s->malloc_limit))
-    return nullptr;
+    return NULL;
   ptr = malloc(size);
   js_trace_malloc_printf(s, "A %zd -> %p\n", size, ptr);
   if (ptr) {

qjsc/qjsc.c

@@ -181,9 +181,16 @@ static void output_object_code(JSContext *ctx, FILE *fo, JSValueConst obj,
 
   namelist_add(&cname_list, c_name, NULL, load_only);
 
-  fprintf(fo, "extern const uint32_t %s_size = %u;\n\n", c_name,
+  fprintf(fo, "\n#ifdef __cplusplus\n /* extern \"C\" { */\n"
+              "  #define EXTERN_CONST extern const\n"
+              "#else\n"
+              "  #define EXTERN_CONST const\n"
+              "#endif\n\n");
+
+  fprintf(fo, "EXTERN_CONST uint32_t %s_size = %u;\n\n", c_name,
+          (unsigned int)out_buf_len);
+  fprintf(fo, "EXTERN_CONST uint8_t %s[%u] = {\n", c_name,
           (unsigned int)out_buf_len);
-  fprintf(fo, "extern const uint8_t %s[%u] = {\n", c_name, (unsigned int)out_buf_len);
   dump_hex(fo, out_buf, out_buf_len);
   fprintf(fo, "};\n\n");
 

tests/CMakeLists.txt

@@ -21,7 +21,13 @@ target_link_options(tests PRIVATE -shared -undefined dynamic_lookup)
 
 add_dependencies(tests qjs examples)
 
-set(QJS "${PROJECT_BINARY_DIR}/qjs/qjs")
+add_custom_target(
+  run-tests
+  COMMAND ctest
+  DEPENDS tests
+  JOB_POOL console)
+
+set(QJS "$<TARGET_FILE:qjs>")
 
 macro(qjs_test)
   add_test(

tests/run-test262/CMakeLists.txt

@@ -11,7 +11,7 @@ target_compile_definitions(run-test262
 
 add_dependencies(run-test262 quickjs)
 
-set(RUN_TEST262 "${PROJECT_BINARY_DIR}/tests/run-test262/run-test262")
+set(RUN_TEST262 "$<TARGET_FILE:run-test262>")
 
 add_custom_target(
   run-test262-test2-default