Merge pull request #5 from sqliteai/ci-integration-test

run integration test in the ci

Author: marcobambini

.github/workflows/release.yml

@@ -87,10 +87,11 @@ jobs:
           echo "::endgroup::"
 
           echo "::group::prepare the test script"
+          make test CC=$CC PLATFORM=$PLATFORM || echo "It should fail. Running remaining commands in the emulator"
           cat > commands.sh << EOF
             mv -f /data/local/tmp/sqlite3 /system/xbin
             cd /data/local/tmp
-            $(make test -n)
+            $(make test CC=$CC PLATFORM=$PLATFORM -n)
           EOF
           echo "::endgroup::"
 

.gitignore

@@ -5,3 +5,4 @@
 *.plist
 /build
 /dist
+*.sqlite

Makefile

@@ -33,8 +33,6 @@ CFLAGS := -Wall -Wextra -fPIC -g -O2 -DQJS_BUILD_LIBC $(INCLUDES)
 ifeq ($(PLATFORM),windows)
     TARGET := $(DIST_DIR)/js.dll
     LDFLAGS := -shared
-    # Windows-specific flags
-    CFLAGS += -D_WIN32
     # Create .def file for Windows
     DEF_FILE := $(BUILD_DIR)/js.def
 else ifeq ($(PLATFORM),macos)
@@ -99,6 +97,8 @@ ifeq ($(PLATFORM),windows)
 	@echo "LIBRARY js.dll" > $@
 	@echo "EXPORTS" >> $@
 	@echo "    sqlite3_js_init" >> $@
+	@echo "    sqlitejs_version" >> $@
+	@echo "    quickjs_version" >> $@
 endif
 
 # Clean up
@@ -119,9 +119,24 @@ else # linux
 	cp $(TARGET) $(DESTDIR)/usr/local/lib/sqlite3/
 endif
 
+# Test source files
+TEST_FILES := test/main.c
+
+# Test target files
+ifeq ($(PLATFORM),windows)
+	TEST_TARGET := $(patsubst %.c,$(DIST_DIR)/%.exe,$(notdir $(TEST_FILES)))
+else
+	TEST_TARGET := $(patsubst %.c,$(DIST_DIR)/%,$(notdir $(TEST_FILES)))
+endif
+
+# Compile test target
+$(TEST_TARGET): $(TEST_FILES) $(TARGET)
+	$(CC) $(INCLUDES) $^ -lm -o $@ libs/sqlite3.c -DSQLITE_CORE
+
 # Testing the extension
-test: $(TARGET)
-	sqlite3 ":memory:" -cmd ".bail on" ".load ./$(TARGET)" "SELECT js_eval('console.log(\"hello, world\nToday is\", new Date().toLocaleDateString())');"
+test: $(TARGET) $(TEST_TARGET)
+	sqlite3 ":memory:" -cmd ".bail on" ".load ./$<" "SELECT js_eval('console.log(\"hello, world\nToday is\", new Date().toLocaleDateString())');"
+	./$(TEST_TARGET)
 
 # Help message
 help:

test/sqlitejs/main.c test/main.ctest/sqlitejs/main.c renamed to test/main.c

@@ -7,7 +7,6 @@
 
 #include <stdio.h>
 #include "sqlite3.h"
-#include "quickjs.h"
 #include "sqlitejs.h"
 
 #define DB_PATH         "js_functions.sqlite"
@@ -33,8 +32,11 @@ int test_serialization (const char *db_path, bool load_functions, int nstep) {
     int rc = sqlite3_open(db_path, &db);
     if (rc != SQLITE_OK) goto abort_test;
 
-    // manually load extension
-    rc = sqlite3_js_init(db, NULL, NULL);
+    // enable load extension
+    rc = sqlite3_enable_load_extension(db, 1);
+    if (rc != SQLITE_OK) goto abort_test;
+
+    rc = db_exec(db, "SELECT load_extension('./dist/js');");
     if (rc != SQLITE_OK) goto abort_test;
 
     rc = db_exec(db, (load_functions) ? "SELECT js_init_table(1);" : "SELECT js_init_table();");
@@ -67,8 +69,11 @@ int test_execution (void) {
     int rc = sqlite3_open(":memory:", &db);
     if (rc != SQLITE_OK) goto abort_test;
 
-    // manually load extension
-    rc = sqlite3_js_init(db, NULL, NULL);
+    // enable load extension
+    rc = sqlite3_enable_load_extension(db, 1);
+    if (rc != SQLITE_OK) goto abort_test;
+    
+    rc = db_exec(db, "SELECT load_extension('./dist/js');");
     if (rc != SQLITE_OK) goto abort_test;
 
     // context