revert code except loader/

.gitignore

@@ -16,3 +16,4 @@ vendor
 tidb-slow.log
 /monitoring/dashboards/dm.json
 /monitoring/rules/dm_worker.rules.yml
+mysql.*.log

Dockerfile

@@ -19,6 +19,8 @@ RUN GO111MODULE=on go mod download
 
 COPY . .
 
+RUN apk update && apk add bash
+
 RUN make dm-worker dm-master dmctl
 
 FROM alpine:3.10

tests/README.md

@@ -13,6 +13,8 @@
     * `bin/dm-worker.test.previous` # generated from `bin/dm-worker.test` by `make compatibility_test`
     * [gh-ost](https://github.com/github/gh-ost) # must be added to path, or you can `export GHOST_BINARY=/path/to/gh-ost-binary`
     * [pt-online-schema-change](https://www.percona.com/doc/percona-toolkit/LATEST/pt-online-schema-change.html) # must be added to path, or you can `export PTOSC_BINARY=/path/to/pt-osc-binary`
+    * [GNU sed](https://www.gnu.org/software/sed/) # must be added to path, BSD sed user should be attention
+    * [GNU awk](https://www.gnu.org/software/gawk/) # must be added to path
 
 2. The following programs must be installed:
 

tests/_utils/env_variables

@@ -6,7 +6,7 @@ MYSQL_PASSWORD1=${MYSQL_PASSWORD1:-123456}
 MYSQL_PASSWORD2=${MYSQL_PASSWORD2:-123456}
 TIDB_PASSWORD=${TIDB_PASSWORD:-123456}
 
-TIDB_PORT=4000
+TIDB_PORT=${TIDB_PORT:-4000}
 MASTER_PORT=8261
 MASTER_PORT1=8261
 MASTER_PORT2=8361
@@ -21,4 +21,6 @@ WORKER4_PORT=18262
 WORKER5_PORT=18263
 SOURCE_ID1="mysql-replica-01"
 SOURCE_ID2="mysql-replica-02"
-RESET_MASTER=${RESET_MASTER:-true}
+RESET_MASTER=${RESET_MASTER:-true}
+
+VERBOSE=${VERBOSE:-false}

tests/run.sh

@@ -76,10 +76,19 @@ start_services
 function run() {
     script=$1
     echo "Running test $script..."
-    TEST_DIR="$TEST_DIR" \
-    PATH="tests/_utils:$PATH" \
-    TEST_NAME="$(basename "$(dirname "$script")")" \
-    bash +x "$script"
+    # run in verbose mode?
+    echo "Verbose mode = $VERBOSE"
+    if $VERBOSE ; then
+        TEST_DIR="$TEST_DIR" \
+        PATH="tests/_utils:$PATH" \
+        TEST_NAME="$(basename "$(dirname "$script")")" \
+        bash -x "$script"
+    else
+        TEST_DIR="$TEST_DIR" \
+        PATH="tests/_utils:$PATH" \
+        TEST_NAME="$(basename "$(dirname "$script")")" \
+        bash +x "$script"
+    fi
 }
 
 if [ "$test_case" == "*" ]; then