Test if CI passes

Signed-off-by: Morgan Tocker <tocker@gmail.com>
vitessio · Aug 10, 2019 · 5a8b3fd · 5a8b3fd
1 parent 7c9da50
commit 5a8b3fd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/build.env b/build.env
@@ -36,4 +36,3 @@ export VTROOT
 if [[ "$VTTOP" == "${VTTOP/\/src\/vitess.io\/vitess/}" ]]; then
  echo "WARNING: VTTOP($VTTOP) does not contain src/vitess.io/vitess"
 fi
-
diff --git a/go/vt/mysqlctl/mysqld.go b/go/vt/mysqlctl/mysqld.go
@@ -151,7 +151,7 @@ func getVersionFromEnv() (flavor mysqlFlavor, ver serverVersion, err error) {
  case "MySQL56":
  return flavorMySQL, serverVersion{5, 7, 10}, nil
  }
- return flavor, ver, fmt.Errorf("Could not determine version from MYSQL_FLAVOR: %s", env)
+ return flavor, ver, fmt.Errorf("could not determine version from MYSQL_FLAVOR: %s", env)
 }
 
 func getVersionString() (string, error) {
@@ -183,19 +183,19 @@ func parseVersionString(version string) (flavor mysqlFlavor, ver serverVersion,
  }
  v := versionRegex.FindStringSubmatch(version)
  if len(v) != 4 {
- return flavor, ver, fmt.Errorf("Could not parse server version from: %s", version)
+ return flavor, ver, fmt.Errorf("could not parse server version from: %s", version)
  }
  ver.Major, err = strconv.Atoi(string(v[1]))
  if err != nil {
- return flavor, ver, fmt.Errorf("Could not parse server version from: %s", version)
+ return flavor, ver, fmt.Errorf("could not parse server version from: %s", version)
  }
  ver.Minor, err = strconv.Atoi(string(v[2]))
  if err != nil {
- return flavor, ver, fmt.Errorf("Could not parse server version from: %s", version)
+ return flavor, ver, fmt.Errorf("could not parse server version from: %s", version)
  }
  ver.Patch, err = strconv.Atoi(string(v[3]))
  if err != nil {
- return flavor, ver, fmt.Errorf("Could not parse server version from: %s", version)
+ return flavor, ver, fmt.Errorf("could not parse server version from: %s", version)
  }
 
  return

diff --git a/test/local_example.sh b/test/local_example.sh
@@ -116,11 +116,11 @@ done
 echo "Run Go client script..."
 go run client.go -server=localhost:15991 || teardown
 
-# echo "Run Java client script..."
-# ./client_java.sh || teardown
+echo "Run Java client script..."
+./client_java.sh || teardown
 
-# echo "Run JDBC client script..."
-# ./client_jdbc.sh || teardown
+echo "Run JDBC client script..."
+./client_jdbc.sh || teardown
 
 exitcode=0
 teardown