From 90cc0691327228d5df7e0111874eb244b92018e9 Mon Sep 17 00:00:00 2001 From: Azareal Date: Tue, 31 Oct 2017 00:33:14 +0000 Subject: [PATCH] Tweak to see if Travis will let this run? Fixes to the installer. --- .travis.yml | 3 ++- install/install.go | 11 ++++++----- run-linux-tests | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ee59c32..ee388c5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,9 @@ go: - master before_install: - chmod 755 ./update-deps-linux + - chmod 755 ./run-linux-tests - ./update-deps-linux install: true -script: go test +script: ./run-linux-tests addons: mariadb: '10.0' \ No newline at end of file diff --git a/install/install.go b/install/install.go index 42927571..bd7a02de 100644 --- a/install/install.go +++ b/install/install.go @@ -112,11 +112,11 @@ func init() { site.Language = "english" // Database details - dbConfig.Host = "` + adap.DbHost() + `" - dbConfig.Username = "` + adap.DbUsername() + `" - dbConfig.Password = "` + adap.DbPassword() + `" - dbConfig.Dbname = "` + adap.DbName() + `" - dbConfig.Port = "` + adap.DbPort() + `" // You probably won't need to change this + dbConfig.Host = "` + adap.DBHost() + `" + dbConfig.Username = "` + adap.DBUsername() + `" + dbConfig.Password = "` + adap.DBPassword() + `" + dbConfig.Dbname = "` + adap.DBName() + `" + dbConfig.Port = "` + adap.DBPort() + `" // You probably won't need to change this // Test Database details dbConfig.TestHost = "" @@ -191,6 +191,7 @@ func abortError(err error) { } func handleDatabaseDetails() (adap install.InstallAdapter, ok bool) { + var dbAdapter string var dbHost string var dbUsername string var dbPassword string diff --git a/run-linux-tests b/run-linux-tests index d192a851..9716fbb1 100644 --- a/run-linux-tests +++ b/run-linux-tests @@ -1,4 +1,5 @@ echo "Generating the dynamic code" go generate echo "Running tests" -go test \ No newline at end of file +go test -o GosoraTests +./GosoraTests \ No newline at end of file