Skip to content
Permalink
Browse files

dev/devcam: use libsqlite3 tag when -sqlite=true

In 5894af5 we chose not to vendor
sqlite3-binding.c and sqlite3-binding.h in, because we rely on the
system's libsqlite3 instead. But we never told devcam test to use the
corresponding necessary "libsqlite3" tag, which is now done in this CL.

Also, comment properly about it in .gitignore.

And make Travis CI use the devcam installed in $GOPATH/bin, instead of
specifically building one in tree.

Change-Id: I4b7bb1305669037f84063c7cf6c7f356c99f3edc
  • Loading branch information
mpl committed Sep 14, 2018
1 parent 016d096 commit ca7f2e57e3ff8c0920dfff22ddeaeeb6adc71a0e
Showing with 8 additions and 8 deletions.
  1. +4 −3 .gitignore
  2. +3 −4 .travis.yml
  3. +1 −1 dev/devcam/test.go
@@ -51,12 +51,13 @@ server/perkeepd/ui/goui.js.map
server/perkeepd/ui/zembed_*
server/perkeepd/ui/closure/z_data.go

# not vendored in, because we build with the system's libsqlite3
/vendor/github.com/mattn/go-sqlite3/sqlite3-binding.c
/vendor/github.com/mattn/go-sqlite3/sqlite3-binding.h

# vendored data we don't want to retain
/vendor/**/.travis.yml
/vendor/**/.gitignore
# contains a private key
/vendor/github.com/mattn/go-sqlite3/sqlite3-binding.c
/vendor/github.com/mattn/go-sqlite3/sqlite3-binding.h
/vendor/github.com/rwcarlsen/goexif/exif/sample1.jpg
/vendor/github.com/rwcarlsen/goexif/tiff/sample1.tif
/vendor/github.com/rwcarlsen/goexif/exif/regen_regress.go
@@ -5,10 +5,9 @@ language: go
go:
- "1.11.x"
before_install:
- sudo apt-get install -qq pkg-config fuse
- sudo apt-get install -qq pkg-config fuse build-essential
- sudo modprobe fuse
- sudo chmod 666 /dev/fuse
- sudo chown root:$USER /etc/fuse.conf
install: go run make.go -v
before_script: go build -o ./bin/devcam ./dev/devcam
script: ./bin/devcam test -sqlite=true
install: go run make.go -v=true -sqlite=true
script: ${GOPATH}/bin/devcam test -sqlite=true
@@ -121,7 +121,7 @@ func (c *testCmd) buildSelf() error {
func (c *testCmd) runTests(args []string) error {
targs := []string{"test"}
if c.sqlite {
targs = append(targs, "--tags=with_sqlite fake_android")
targs = append(targs, "--tags=with_sqlite fake_android libsqlite3")
} else {
targs = append(targs, "--tags=fake_android")
}

0 comments on commit ca7f2e5

Please sign in to comment.
You can’t perform that action at this time.