add test && fix makefile && fix vscode build

This commit is contained in:
2025-01-07 23:02:57 +05:00
parent 01d0bf60a6
commit 3c02c38b65
3 changed files with 19 additions and 40 deletions

38
.vscode/tasks.json vendored
View File

@@ -1,27 +1,9 @@
{ {
"tasks": [ "tasks": [
{
"type": "shell",
"label": "Rebuild",
"command": "-C ${workspaceFolder} rebuild",
"group": {
"kind": "build",
"isDefault": true
},
"detail": "Rebuild this lib",
"problemMatcher": [
"$gcc"
],
"options": {
"shell": {
"executable": "make",
}
}
},
{ {
"type": "shell", "type": "shell",
"label": "Build", "label": "Build",
"command": "-C ${workspaceFolder} build", "command": "-C ${workspaceFolder} all",
"group": { "group": {
"kind": "build", "kind": "build",
"isDefault": false "isDefault": false
@@ -35,24 +17,6 @@
"executable": "make", "executable": "make",
} }
} }
},
{
"type": "shell",
"label": "Debug Build",
"command": "-C ${workspaceFolder} \"MYCFLAGS=-DNDEBUG\" build",
"group": {
"kind": "build",
"isDefault": false
},
"detail": "Debug build this lib",
"problemMatcher": [
"$gcc"
],
"options": {
"shell": {
"executable": "make",
}
}
} }
], ],
"version": "2.0.0" "version": "2.0.0"

View File

@@ -8,10 +8,10 @@ LD=kos32-ld
STRIP=kos32-strip STRIP=kos32-strip
OBJCOPY=kos32-objcopy OBJCOPY=kos32-objcopy
KOLIBRIOS_REPO=../../kolibrios KOLIBRIOS_REPO=../kolibrios
C_LAYER_DIR=$(KOLIBRIOS_REPO)/contrib/C_Layer C_LAYER_DIR=$(KOLIBRIOS_REPO)/contrib/C_Layer
LUA_DIR=../../lua-kolibrios LUA_DIR=../lua-kolibrios
SQLITE3_DIR=$(SDK_DIR)/sources/sqlite3 SQLITE3_DIR=$(SDK_DIR)/sources/sqlite3
SDK_DIR=$(KOLIBRIOS_REPO)/contrib/sdk SDK_DIR=$(KOLIBRIOS_REPO)/contrib/sdk
@@ -66,7 +66,7 @@ test: $(T)
$(LUAEXE) test.lua $(LUAEXE) test.lua
$(LUAEXE) tests-sqlite3.lua $(LUAEXE) tests-sqlite3.lua
$(T): $(OBJS) $() $(T): $(OBJS) $(LUALIB)
$(CC) $(SHFLAGS) $(SOFLAGS) -o $@ $(OBJS) $(LIBS) $(CC) $(SHFLAGS) $(SOFLAGS) -o $@ $(OBJS) $(LIBS)
install: $(T) $(OBJS) $(SQLITE3_DIR)/libsqlite3.dll.a install: $(T) $(OBJS) $(SQLITE3_DIR)/libsqlite3.dll.a
@@ -96,3 +96,5 @@ $(MYLIB).o: lsqlite3.c
extras/extension-functions.o: extras/extension-functions.c extras/extension-functions.o: extras/extension-functions.c
$(SQLITE3_DIR)/libsqlite3.dll.a: $(SQLITE3_DIR)/libsqlite3.dll.a:
$(MAKE) -C $(SQLITE3_DIR) libsqlite3.dll.a $(MAKE) -C $(SQLITE3_DIR) libsqlite3.dll.a
$(LUALIB):
$(MAKE) -C $(LUAINC) lua54.dll

13
test/test.sh Normal file
View File

@@ -0,0 +1,13 @@
#SHS
/kolibrios/lua test.lua
/kolibrios/lua test-dyld.lua
/kolibrios/lua tests-sqlite3.lua
/kolibrios/lua ../examples/aggregate.lua
/kolibrios/lua ../examples/function.lua
/kolibrios/lua ../examples/order.lua
/kolibrios/lua ../examples/simple.lua
/kolibrios/lua ../examples/smart.lua
/kolibrios/lua ../examples/statement.lua
/kolibrios/lua ../examples/tracing.lua
/kolibrios/lua ../examples/update_hook.lua