summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2014-06-11 10:34:43 +0200
committerAndreas Baumann <abaumann@yahoo.com>2014-06-11 10:34:43 +0200
commit614399624b63beb12b8b04cfdc243dcfe6171a63 (patch)
treea0dddc1f7897b629c826f49a2e7cec11c2393862
parent6bef181a47264ae3bfb926965b0ca798566675dc (diff)
parent3cb947a94ae1b2ce436c9694beab54cae9793950 (diff)
downloadsqlitexx-614399624b63beb12b8b04cfdc243dcfe6171a63.tar.gz
sqlitexx-614399624b63beb12b8b04cfdc243dcfe6171a63.tar.bz2
Merge branch 'master' of github.com:andreasbaumann/sqlitexx
Conflicts: src/port/sys_internal.h
-rw-r--r--tests/GNUmakefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/GNUmakefile b/tests/GNUmakefile
index 8701359..d2fdc29 100644
--- a/tests/GNUmakefile
+++ b/tests/GNUmakefile
@@ -55,6 +55,7 @@ test9$(EXE): $(TOPDIR)/src/libsqlite3xx.a threads.o
# disabled tests
#-@./exec_test test6 "STL iterators" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
#-@./exec_test test7 "tracing" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
+#@./exec_test test9 "ticket #5: support in multi-threaded enironment" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
# create the must files with ./test2 | sed 's/\(time:[^\)]*\)//g' > test2.MUST
# to eliminate the execution time..
@@ -66,4 +67,3 @@ local_test:
@./exec_test test4 "type conversion of bind parameters" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
@./exec_test test5 "PRAGMAs outside a transaction" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
@./exec_test test8 "ticket #14: to conversion fails with SQLITE_NULL" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
- @./exec_test test9 "ticket #5: support in multi-threaded enironment" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"