Skip to content

Commit a965a31

Browse files
authored
Merge pull request #9303 from xudong963/remove_old
chore: remove old sqllogictest
2 parents 1ff7ae5 + d137a46 commit a965a31

File tree

361 files changed

+22
-2189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

361 files changed

+22
-2189
lines changed

.github/actions/fuse_compat/action.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,15 @@ runs:
1919
sha: ${{ github.sha }}
2020
target: ${{ inputs.target }}
2121
path: ./bins/current
22-
22+
- name: Setup Build Tool
23+
uses: ./.github/actions/setup_build_tool
24+
with:
25+
bypass_env_vars: RUSTFLAGS,RUSTDOCFLAGS,RUST_TEST_THREADS,RUST_LOG,RUST_BACKTRACE
2326
- name: Test compatibility
2427
shell: bash
2528
run: |
26-
docker run --rm --tty --net=host \
27-
--user $(id -u):$(id -g) \
28-
--env BUILD_PROFILE \
29-
--volume "${PWD}:/workspace" \
30-
--workdir "/workspace" \
31-
datafuselabs/build-tool:sqllogic \
3229
bash ./tests/fuse-compat/test-fuse-compat.sh 0.7.150
33-
docker run --rm --tty --net=host \
34-
--user $(id -u):$(id -g) \
35-
--env BUILD_PROFILE \
36-
--volume "${PWD}:/workspace" \
37-
--workdir "/workspace" \
38-
datafuselabs/build-tool:sqllogic \
3930
bash ./tests/fuse-compat/test-fuse-compat.sh 0.7.151
40-
4131
- name: Upload failure
4232
if: failure()
4333
uses: ./.github/actions/artifact_failure

.github/workflows/databend-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ jobs:
308308
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
309309
run: |
310310
version=${{ needs.create_release.outputs.version }}
311-
tar -C ./tests/logictest -czvf testsuites-${version}.tar.gz suites
311+
tar -C ./tests/sqllogictests -czvf testsuites-${version}.tar.gz suites
312312
gh release upload ${version} testsuites-${version}.tar.gz --clobber
313313
314314
release_docker_combined:

tests/compat/test-compat.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,8 @@ run_test() {
208208
echo " === Run metasrv related test: 05_ddl"
209209

210210
if [ "$query_ver" = "current" ]; then
211-
cd "$SCRIPT_PATH/../../tests/logictest" || exit
212211
# Only run test on mysql handler
213-
python3 main.py "_ddl_" --handlers mysql
214-
cd -
212+
cargo run -p sqllogictests -- --handlers mysql --run_dir 05_ddl
215213
else
216214
(
217215
# download suites into ./old_suite

tests/fuse-compat/test-fuse-compat.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,9 @@ git_partial_clone() {
9090

9191
# Run specified tests found in logic test suite dir
9292
run_logictest() {
93-
local pattern="$1"
9493
(
95-
cd "tests/logictest"
9694
# Only run test on mysql handler
97-
python3 main.py "$pattern" --handlers mysql --suites "$SCRIPT_PATH/compat-logictest"
95+
cargo run -p sqllogictests -- --handlers mysql --suites "$logictest_path"
9896
)
9997

10098
}

tests/logictest/Dockerfile

-16
This file was deleted.

tests/logictest/README.md

-213
This file was deleted.

tests/logictest/cleanup.py

-51
This file was deleted.

0 commit comments

Comments
 (0)