From 79e4aafacc9e2c816baf80c49292b2a37703a9c7 Mon Sep 17 00:00:00 2001 From: Thomas Tsai Date: Wed, 11 Jan 2023 14:24:17 +0800 Subject: [PATCH 1/2] Create manual-on-host.yml update tests for nilfs2 update tests for offset and fueimage --- .github/workflows/manual-on-host.yml | 68 ++++++++++++++++++++++++++++ src/version.h | 2 +- tests/Makefile.am | 4 +- tests/_common | 2 + tests/data_clone_restore_test | 8 ++++ 5 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/manual-on-host.yml diff --git a/.github/workflows/manual-on-host.yml b/.github/workflows/manual-on-host.yml new file mode 100644 index 00000000..bc4440d0 --- /dev/null +++ b/.github/workflows/manual-on-host.yml @@ -0,0 +1,68 @@ +name: Manual workflow on my host +on: + workflow_dispatch: + inputs: + name: + description: 'manually run build test' + +jobs: + dataTest: + runs-on: self-hosted + steps: + - uses: actions/checkout@v3 + - name: install packages + run: | + sudo sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list + sudo apt-get update + sudo apt-get build-dep -y partclone + sudo apt-get install -y f2fs-tools hfsprogs exfatprogs gddrescue libfuse-dev + - name: automake + run: ./autogen + - name: configure + run: ./configure --enable-fs-test --enable-feature-test --enable-extfs --enable-ntfs --enable-fat --enable-exfat --enable-hfsp --enable-apfs --enable-btrfs --enable-minix --enable-f2fs --enable-reiser4 --enable-xfs --enable-nilfs2 --enable-fuse + - name: make + run: make + - name: makeTest + run: make check + - name: btrfs Data Test + if: always() + run: cd tests && sudo env SOURCEPART="/dev/vdb1" env TARGETPART="/dev/vdb2" bash -x ./data_clone_restore_test btrfs && cd ../ && pwd + - name: f2fs Data Test + if: always() + run: cd tests && sudo env SOURCEPART="/dev/vdb1" env TARGETPART="/dev/vdb2" bash -x ./data_clone_restore_test f2fs && cd ../ && pwd + - name: nilfs2 Data Test + if: always() + run: cd tests && sudo env SOURCEPART="/dev/vdb1" env TARGETPART="/dev/vdb2" bash -x ./data_clone_restore_test nilfs2 && cd ../ && pwd + - name: hfsplus Data Test + if: always() + run: cd tests && sudo env SOURCEPART="/dev/vdb1" env TARGETPART="/dev/vdb2" bash -x ./data_clone_restore_test hfsplus && cd ../ && pwd + - name: xfs Data Test + if: always() + run: cd tests && sudo env SOURCEPART="/dev/vdb1" env TARGETPART="/dev/vdb2" bash -x ./data_clone_restore_test xfs && cd ../ && pwd + - name: ext2 Data Test + if: always() + run: cd tests && sudo env SOURCEPART="/dev/vdb1" env TARGETPART="/dev/vdb2" bash -x ./data_clone_restore_test ext2 && cd ../ && pwd + - name: ext3 Data Test + if: always() + run: cd tests && sudo env SOURCEPART="/dev/vdb1" env TARGETPART="/dev/vdb2" bash -x ./data_clone_restore_test ext3 && cd ../ && pwd + - name: ext4 Data Test + if: always() + run: cd tests && sudo env SOURCEPART="/dev/vdb1" env TARGETPART="/dev/vdb2" bash -x ./data_clone_restore_test ext4 && cd ../ && pwd + - name: vfat Data Test + if: always() + run: cd tests && sudo env SOURCEPART="/dev/vdb1" env TARGETPART="/dev/vdb2" bash -x ./data_clone_restore_test vfat && cd ../ && pwd + - name: exfat Data Test + if: always() + run: cd tests && sudo env SOURCEPART="/dev/vdb1" env TARGETPART="/dev/vdb2" bash -x ./data_clone_restore_test exfat && cd ../ && pwd + - name: ntfs Data Test + if: always() + run: cd tests && sudo env SOURCEPART="/dev/vdb1" env TARGETPART="/dev/vdb2" bash -x ./data_clone_restore_test ntfs && cd ../ && pwd + - name: minix Data Test + if: always() + run: cd tests && sudo env SOURCEPART="/dev/vdb1" env TARGETPART="/dev/vdb2" bash -x ./data_clone_restore_test minix && cd ../ && pwd + - name: fuse Test + if: always() + run: cd tests && sudo ./imgfuse.test && cd ../ && pwd + - name: offset Test + if: always() + run: cd tests && sudo ./offset.test && cd ../ && pwd diff --git a/src/version.h b/src/version.h index 28f992be..b75283b9 100644 --- a/src/version.h +++ b/src/version.h @@ -3,5 +3,5 @@ * WHETHER THEY ARE BUILT BY OTHERS OR DURING DEVELOPMENT OR FOR THE * OFFICIAL PARTCLONE RELEASES. */ -#define git_version "895b2fccd6a08b77e650a1a682a5f6252cb301fe" +#define git_version "d0864038eaa3b698de7c58368c2203dc51d65746" diff --git a/tests/Makefile.am b/tests/Makefile.am index af92b062..ad55ae4d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,7 +20,7 @@ TESTS += reiserfs.test endif #if ENABLE_REISER4 -#TESTS += reiser4.test +TESTS += reiser4.test #endif if ENABLE_HFSP @@ -64,7 +64,7 @@ TESTS += exfat.test endif if ENABLE_NILFS2 -TESTS += nilfs2.test +#TESTS += nilfs2.test endif if ENABLE_NCURSESW diff --git a/tests/_common b/tests/_common index f65c6d24..dda96dca 100755 --- a/tests/_common +++ b/tests/_common @@ -27,6 +27,8 @@ mkfs_option_for_btrfs='-f' mkfs_option_for_fat12='-F 12' mkfs_option_for_fat16='-F 16' mkfs_option_for_fat32='-F 32' +mkfs_option_for_f2fs='-f' +mkfs_option_for_nilfs2='-f' #mkfs_option_for_minix='-3' ## file system diff --git a/tests/data_clone_restore_test b/tests/data_clone_restore_test index 51ca1907..7dd08ea0 100755 --- a/tests/data_clone_restore_test +++ b/tests/data_clone_restore_test @@ -17,6 +17,14 @@ data_pool="/test/datapool/" chfile="/test/checksum.log" cchfile="/test/checksum_test.log" +if [ "X$SOURCEPART" != "X" ]; then + source_partition=$SOURCEPART +fi + +if [ "X$TARGETPART" != "X" ]; then + target_partition=$TARGETPART +fi + #main for fs in $test_fs; do echo -e "Advanced $fs test" From 8557c4e856f2e9130a9d648be210b55ff06722d8 Mon Sep 17 00:00:00 2001 From: Thomas Tsai Date: Fri, 13 Jan 2023 11:06:23 +0800 Subject: [PATCH 2/2] add reiser4progs for test --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index b68cb4d0..2476249f 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -18,7 +18,7 @@ jobs: sudo sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list sudo apt-get update sudo apt-get build-dep partclone - sudo apt-get install f2fs-tools hfsprogs exfatprogs gddrescue + sudo apt-get install f2fs-tools hfsprogs exfatprogs gddrescue reiser4progs - name: automake run: ./autogen - name: configure