From 1f7297571de6bff4c53ca2664195e40f20a9f62c Mon Sep 17 00:00:00 2001 From: Takeshi Nakatani Date: Sun, 24 Sep 2023 14:43:57 +0000 Subject: [PATCH] Check test_not_existed_dir_obj error on alpine for debugging --- .github/workflows/ci.yml | 74 ++++++++++++---------- test/integration-test-common.sh | 1 + test/integration-test-main.sh | 107 +------------------------------- 3 files changed, 42 insertions(+), 140 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 58759b0bf7..26513fc22f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,20 +50,21 @@ jobs: # matrix: container: - - ubuntu:23.04 - - ubuntu:22.04 - - ubuntu:20.04 - - debian:bookworm - - debian:bullseye - - debian:buster - - rockylinux:9 - - rockylinux:8 - - centos:centos7 - - fedora:38 - - fedora:37 - - opensuse/leap:15 - alpine:3.17 + # - ubuntu:23.04 + # - ubuntu:22.04 + # - ubuntu:20.04 + # - debian:bookworm + # - debian:bullseye + # - debian:buster + # - rockylinux:9 + # - rockylinux:8 + # - centos:centos7 + # - fedora:38 + # - fedora:37 + # - opensuse/leap:15 + container: image: ${{ matrix.container }} @@ -100,31 +101,34 @@ jobs: /bin/sh -c "./configure ${CONFIGURE_OPTIONS}" make --jobs=$(nproc) - - name: clang-tidy - run: | - # skip if clang-tidy does not exist, e.g., CentOS 7 - if command -v clang-tidy; then - make -C src/ clang-tidy - make -C test/ clang-tidy - fi - - - name: Cppcheck - run: | - # specify the version range to run cppcheck (cppcheck version number is x.y or x.y.z) - if cppcheck --version | sed -e 's/\./ /g' | awk '{if (($2 * 1000 + $3) <= 2004) { exit(1) } }'; then - make cppcheck - fi - - - name: Shellcheck - run: | - if shellcheck --version | awk -F '[ .]' '/version:/ && ($2 * 1000 + $3 <= 7) { exit(1) }'; then - make shellcheck - fi + #- name: clang-tidy + # run: | + # # skip if clang-tidy does not exist, e.g., CentOS 7 + # if command -v clang-tidy; then + # make -C src/ clang-tidy + # make -C test/ clang-tidy + # fi + + #- name: Cppcheck + # run: | + # # specify the version range to run cppcheck (cppcheck version number is x.y or x.y.z) + # if cppcheck --version | sed -e 's/\./ /g' | awk '{if (($2 * 1000 + $3) <= 2004) { exit(1) } }'; then + # make cppcheck + # fi + + #- name: Shellcheck + # run: | + # if shellcheck --version | awk -F '[ .]' '/version:/ && ($2 * 1000 + $3 <= 7) { exit(1) }'; then + # make shellcheck + # fi - name: Test suite run: | - make check -C src - make ALL_TESTS=1 check -C test || (test/filter-suite-log.sh test/test-suite.log; exit 1) + cd test + ALL_TESTS=1 ./small-integration-test.sh + + # make check -C src + # make ALL_TESTS=1 check -C test || (test/filter-suite-log.sh test/test-suite.log; exit 1) # [NOTE] # This Job does not work for macOS 11 and later because load_osxfuse returns exit code = 1. @@ -196,6 +200,8 @@ jobs: make ALL_TESTS=1 check -C test || (test/filter-suite-log.sh test/test-suite.log; exit 1) MemoryTest: + if: false + runs-on: ubuntu-latest # diff --git a/test/integration-test-common.sh b/test/integration-test-common.sh index 6ab53f351c..ec02002800 100644 --- a/test/integration-test-common.sh +++ b/test/integration-test-common.sh @@ -306,6 +306,7 @@ function start_s3fs { -o stat_cache_expire=1 \ -o stat_cache_interval_expire=1 \ -o dbglevel="${DBGLEVEL:=info}" \ + -o curldbg \ -o no_time_stamp_msg \ -o retries=3 \ -f \ diff --git a/test/integration-test-main.sh b/test/integration-test-main.sh index 65e2a114b1..778268bd31 100755 --- a/test/integration-test-main.sh +++ b/test/integration-test-main.sh @@ -2575,112 +2575,7 @@ function test_statvfs() { } function add_all_tests { - if s3fs_args | grep -q use_cache; then - add_tests test_cache_file_stat - add_tests test_zero_cache_file_stat - else - add_tests test_file_names_longer_than_posix - fi - if ! s3fs_args | grep -q ensure_diskfree && ! uname | grep -q Darwin; then - add_tests test_clean_up_cache - fi - add_tests test_create_empty_file - add_tests test_append_file - add_tests test_truncate_file - add_tests test_truncate_upload - add_tests test_truncate_empty_file - add_tests test_truncate_shrink_file - add_tests test_truncate_shrink_read_file - add_tests test_mv_file - add_tests test_mv_to_exist_file - add_tests test_mv_empty_directory - add_tests test_mv_nonempty_directory - add_tests test_redirects - add_tests test_mkdir_rmdir - add_tests test_chmod - add_tests test_chown - add_tests test_list - add_tests test_remove_nonempty_directory - add_tests test_external_directory_creation - add_tests test_external_modification - add_tests test_external_creation - add_tests test_read_external_object - add_tests test_read_external_dir_object - add_tests test_update_metadata_external_small_object - add_tests test_update_metadata_external_large_object - add_tests test_rename_before_close - add_tests test_multipart_upload - add_tests test_multipart_copy - add_tests test_multipart_mix - add_tests test_utimens_during_multipart - add_tests test_special_characters - add_tests test_hardlink - add_tests test_symlink - if ! uname | grep -q Darwin; then - add_tests test_mknod - fi - add_tests test_extended_attributes - add_tests test_mtime_file - - add_tests test_update_time_chmod - add_tests test_update_time_chown - add_tests test_update_time_xattr - add_tests test_update_time_touch - if ! mount -t fuse.s3fs | grep "$TEST_BUCKET_MOUNT_POINT_1 " | grep -q -e noatime -e relatime ; then - add_tests test_update_time_touch_a - fi - add_tests test_update_time_append - add_tests test_update_time_cp_p - add_tests test_update_time_mv - - add_tests test_update_directory_time_chmod - add_tests test_update_directory_time_chown - add_tests test_update_directory_time_set_xattr - add_tests test_update_directory_time_touch - if ! mount -t fuse.s3fs | grep "$TEST_BUCKET_MOUNT_POINT_1 " | grep -q -e noatime -e relatime ; then - add_tests test_update_directory_time_touch_a - fi - add_tests test_update_directory_time_subdir - add_tests test_update_chmod_opened_file - if s3fs_args | grep -q update_parent_dir_stat; then - add_tests test_update_parent_directory_time - fi - if ! s3fs_args | grep -q use_xattr; then - add_tests test_posix_acl - fi - - add_tests test_rm_rf_dir - add_tests test_copy_file - add_tests test_write_after_seek_ahead - add_tests test_overwrite_existing_file_range - add_tests test_concurrent_directory_updates - add_tests test_concurrent_reads - add_tests test_concurrent_writes - add_tests test_open_second_fd - add_tests test_write_multiple_offsets - add_tests test_write_multiple_offsets_backwards - add_tests test_content_type - add_tests test_truncate_cache - add_tests test_upload_sparsefile - add_tests test_mix_upload_entities - # TODO: investigate why only Alpine cannot see the implicit directory objects. - if grep -q -i -e 'ID="alpine"' /etc/os-release; then - add_tests test_not_existed_dir_obj - fi - add_tests test_ut_ossfs - add_tests test_cr_filename - if ! s3fs_args | grep -q ensure_diskfree && ! uname | grep -q Darwin; then - add_tests test_ensurespace_move_file - fi - add_tests test_write_data_with_skip - - # [NOTE] - # The test on CI will fail depending on the permissions, so skip these(chmod/chown). - # - # add_tests test_chmod_mountpoint - # add_tests test_chown_mountpoint - add_tests test_time_mountpoint - add_tests test_statvfs + add_tests test_not_existed_dir_obj } init_suite