From b1bf8c030996d1472f1d3496c6704de6afb6a7b0 Mon Sep 17 00:00:00 2001 From: JaySon-Huang Date: Sat, 20 Mar 2021 10:40:40 +0800 Subject: [PATCH] Cleanup some useless scripts for testing Signed-off-by: JaySon-Huang --- tests/_env.sh | 5 +- tests/docker/cluster_clustered_index.yaml | 57 ------------------- tests/docker/config/tidb_new_collation.toml | 1 - tests/docker/run.sh | 9 ++- .../clustered_index}/data_type.test | 0 .../clustered_index}/ddl.test | 0 .../clustered_index}/issue_1514.test | 0 .../clustered_index}/query.test | 0 8 files changed, 10 insertions(+), 62 deletions(-) delete mode 100644 tests/docker/cluster_clustered_index.yaml rename tests/{clustered_index_fullstack => fullstack-test-dt/clustered_index}/data_type.test (100%) rename tests/{clustered_index_fullstack => fullstack-test-dt/clustered_index}/ddl.test (100%) rename tests/{clustered_index_fullstack => fullstack-test-dt/clustered_index}/issue_1514.test (100%) rename tests/{clustered_index_fullstack => fullstack-test-dt/clustered_index}/query.test (100%) diff --git a/tests/_env.sh b/tests/_env.sh index 98526e4ab43..4defe2563fe 100644 --- a/tests/_env.sh +++ b/tests/_env.sh @@ -7,6 +7,7 @@ if [ `uname` == "Darwin" ]; then else export build_dir="../../build" fi +# export build_dir="../cmake-build-debug" export storage_bin="$build_dir/dbms/src/Server/tiflash" @@ -39,5 +40,5 @@ export verbose="false" # export verbose="true" # Setup running env vars -source ../../_vars.sh -setup_dylib_path +#source ../../_vars.sh +#setup_dylib_path diff --git a/tests/docker/cluster_clustered_index.yaml b/tests/docker/cluster_clustered_index.yaml deleted file mode 100644 index ecd55ad403c..00000000000 --- a/tests/docker/cluster_clustered_index.yaml +++ /dev/null @@ -1,57 +0,0 @@ -version: '2.3' - -services: - pd0: - image: hub.pingcap.net/qa/pd:${BRANCH:-master} - ports: - - "2379:2379" - volumes: - - ./config/pd.toml:/pd.toml:ro - - ./data/pd0:/data - - ./log/pd0:/log - command: - - --name=pd0 - - --client-urls=http://0.0.0.0:2379 - - --peer-urls=http://0.0.0.0:2380 - - --advertise-client-urls=http://pd0:2379 - - --advertise-peer-urls=http://pd0:2380 - - --initial-cluster=pd0=http://pd0:2380 - - --config=/pd.toml - - --data-dir=/data - - --log-file=/log/pd.log - restart: on-failure - tikv0: - image: hub.pingcap.net/qa/tikv:${BRANCH:-master} - ports: - - "20160:20160" - volumes: - - ./config/tikv.toml:/tikv.toml:ro - - ./data/tikv0:/data - - ./log/tikv0:/log - command: - - --addr=0.0.0.0:20160 - - --advertise-addr=tikv0:20160 - - --pd=pd0:2379 - - --config=/tikv.toml - - --data-dir=/data - - --log-file=/log/tikv.log - depends_on: - - "pd0" - restart: on-failure - tidb0: - image: hub.pingcap.net/qa/tidb:${BRANCH:-master} - ports: - - "4000:4000" - - "10080:10080" - volumes: - - ./config/tidb_clustered_index.toml:/tidb.toml:ro - - ./log/tidb0:/log - command: - - --store=tikv - - --path=pd0:2379 - - --config=/tidb.toml - - --log-file=/log/tidb.log - - --advertise-address=tidb0 - depends_on: - - "tikv0" - restart: on-failure diff --git a/tests/docker/config/tidb_new_collation.toml b/tests/docker/config/tidb_new_collation.toml index 5ac80f50bde..e110c300fc9 100644 --- a/tests/docker/config/tidb_new_collation.toml +++ b/tests/docker/config/tidb_new_collation.toml @@ -1,5 +1,4 @@ # TiDB Configuration. host = "0.0.0.0" -alter-primary-key = true new_collations_enabled_on_first_bootstrap = true diff --git a/tests/docker/run.sh b/tests/docker/run.sh index 11eda91fd23..377965b491d 100644 --- a/tests/docker/run.sh +++ b/tests/docker/run.sh @@ -58,7 +58,12 @@ fi # Stop all docker instances if exist. -docker-compose -f gtest.yaml -f cluster.yaml -f cluster_new_collation.yaml -f cluster_clustered_index.yaml -f tiflash-dt.yaml -f mock-test-dt.yaml \ +docker-compose \ + -f gtest.yaml \ + -f cluster.yaml \ + -f cluster_new_collation.yaml \ + -f tiflash-dt.yaml \ + -f mock-test-dt.yaml \ -f cluster_tidb_fail_point.yaml \ down @@ -93,7 +98,7 @@ rm -rf ./data ./log # run fullstack-tests (for engine DeltaTree) docker-compose -f cluster.yaml -f tiflash-dt.yaml up -d wait_env dt -docker-compose -f cluster.yaml -f tiflash-dt.yaml exec -T tiflash0 bash -c 'cd /tests ; ./run-test.sh fullstack-test true && ./run-test.sh fullstack-test-dt && ./run-test.sh clustered_index_fullstack' +docker-compose -f cluster.yaml -f tiflash-dt.yaml exec -T tiflash0 bash -c 'cd /tests ; ./run-test.sh fullstack-test true && ./run-test.sh fullstack-test-dt' docker-compose -f cluster.yaml -f tiflash-dt.yaml down rm -rf ./data ./log diff --git a/tests/clustered_index_fullstack/data_type.test b/tests/fullstack-test-dt/clustered_index/data_type.test similarity index 100% rename from tests/clustered_index_fullstack/data_type.test rename to tests/fullstack-test-dt/clustered_index/data_type.test diff --git a/tests/clustered_index_fullstack/ddl.test b/tests/fullstack-test-dt/clustered_index/ddl.test similarity index 100% rename from tests/clustered_index_fullstack/ddl.test rename to tests/fullstack-test-dt/clustered_index/ddl.test diff --git a/tests/clustered_index_fullstack/issue_1514.test b/tests/fullstack-test-dt/clustered_index/issue_1514.test similarity index 100% rename from tests/clustered_index_fullstack/issue_1514.test rename to tests/fullstack-test-dt/clustered_index/issue_1514.test diff --git a/tests/clustered_index_fullstack/query.test b/tests/fullstack-test-dt/clustered_index/query.test similarity index 100% rename from tests/clustered_index_fullstack/query.test rename to tests/fullstack-test-dt/clustered_index/query.test