diff --git a/.travis.yml b/.travis.yml index f03080e..778a1aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,4 +14,4 @@ before_install: - go get golang.org/x/tools/cmd/cover script: - $HOME/gopath/bin/goveralls - - go test -v . -tags "libsqlite3" + - go test . -a -tags "libsqlite3" diff --git a/.travis/install.sh b/.travis/install.sh index 1214710..eebd400 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -1,5 +1,6 @@ #!/bin/bash if [[ $TRAVIS_OS_NAME == "osx" ]]; then - brew install libsqlite3 + brew update + brew install sqlite3 fi diff --git a/README.md b/README.md index 1092c9b..c2e0d5a 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ FAQ * Want to build go-sqlite3 with libsqlite3 on OS X. Install sqlite3 from homebrew: `brew install sqlite3` + Use `go build --tags "libsqlite3 darwin"` * Want to build go-sqlite3 with icu extension. diff --git a/sqlite3_fts3_test.go b/sqlite3_fts3_test.go index 803afbd..e06fc5d 100644 --- a/sqlite3_fts3_test.go +++ b/sqlite3_fts3_test.go @@ -93,7 +93,10 @@ func TestFTS4(t *testing.T) { _, err = db.Exec("DROP TABLE foo") _, err = db.Exec("CREATE VIRTUAL TABLE foo USING fts4(tokenize=unicode61, id INTEGER PRIMARY KEY, value TEXT)") - if err != nil { + switch { + case err != nil && err.Error() == "unknown tokenizer: unicode61": + t.Skip("FTS4 not supported") + case err != nil: t.Fatal("Failed to create table:", err) }