From fa9cf8a559666d5c373a031542407a7f8d08f604 Mon Sep 17 00:00:00 2001 From: Jonatan Antoni Date: Tue, 12 Mar 2024 14:28:52 +0100 Subject: [PATCH] Fix apply_patch with missing find_eol_converter --- .gitattributes | 4 +++ gen-pack | 1 + test/test_integ_default/src/mac.c | 1 + test/test_integ_default/src/win.c | 2 ++ test/test_integ_default/test.patch | 13 ++++++++ test/tests_integ.sh | 48 +++++++++++++++++++----------- 6 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 .gitattributes create mode 100644 test/test_integ_default/src/mac.c create mode 100644 test/test_integ_default/src/win.c diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..87b6083 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,4 @@ +test/test_integ_default/src/mac.c text eol=cr +test/test_integ_default/src/test.c text eol=lf +test/test_integ_default/src/win.c text eol=crlf + diff --git a/gen-pack b/gen-pack index 94f4dc7..b823599 100644 --- a/gen-pack +++ b/gen-pack @@ -343,6 +343,7 @@ function gen_pack { ;; esac fi + find_eol_converter echo_log " " diff --git a/test/test_integ_default/src/mac.c b/test/test_integ_default/src/mac.c new file mode 100644 index 0000000..6c29db6 --- /dev/null +++ b/test/test_integ_default/src/mac.c @@ -0,0 +1 @@ +void mac() { } \ No newline at end of file diff --git a/test/test_integ_default/src/win.c b/test/test_integ_default/src/win.c new file mode 100644 index 0000000..17488c3 --- /dev/null +++ b/test/test_integ_default/src/win.c @@ -0,0 +1,2 @@ +void win() { +} diff --git a/test/test_integ_default/test.patch b/test/test_integ_default/test.patch index 5c5aa55..24418f7 100644 --- a/test/test_integ_default/test.patch +++ b/test/test_integ_default/test.patch @@ -8,3 +8,16 @@ +void test() { + /* some additional code */ +} +--- src/win.c ++++ src/win.c +@@ -1,2 +1,3 @@ + void win() { ++ /* some additional code */ + } +--- src/mac.c ++++ src/mac.c +@@ -1,2 +1,3 @@ + void mac() { ++ /* some additional code */ + } + \ No newline at end of file diff --git a/test/tests_integ.sh b/test/tests_integ.sh index ed23c2b..0c2d41f 100755 --- a/test/tests_integ.sh +++ b/test/tests_integ.sh @@ -12,6 +12,14 @@ DIRNAME="$(realpath "$(dirname "$0")")" +shopt -s expand_aliases + +case $(uname -s) in + 'Darwin') + alias "stat"="gstat" + ;; +esac + setUp() { # shellcheck disable=SC2155 export GEN_PACK_LIB="$(realpath "${DIRNAME}/../")" @@ -35,19 +43,25 @@ test_integ_default() { rm -rf build output - ./gen_pack.sh -k - - assertTrue "Pack description file missing" "[ -f build/ARM.GenPack.pdsc ]" - assertTrue "Pack checksum file missing" "[ -f build/ARM.GenPack.sha1 ]" - assertTrue "LICENSE file" "[ -f build/LICENSE ]" - assertTrue "Doc top level index missing" "[ -f build/doc/index.html ]" - assertFalse "Doxyfile found in build" "[ -f build/doc/test.dxy ]" - assertTrue "Doc index file missing" "[ -f build/doc/html/index.html ]" - assertTrue "Header file missing" "[ -f build/inc/test.h ]" - assertTrue "Source file missing" "[ -f build/src/test.c ]" - assertTrue "Pack archive missing" "[ -f output/ARM.GenPack.1.0.1-dev1.pack ]" - - assertTrue "Checksum file verification failed" "cd build; sha1sum ARM.GenPack.sha1" + ./gen_pack.sh --verbose -k + + assertTrue "Pack description file missing" "[ -f build/ARM.GenPack.pdsc ]" + assertTrue "Pack checksum file missing" "[ -f build/ARM.GenPack.sha1 ]" + assertTrue "LICENSE file" "[ -f build/LICENSE ]" + assertTrue "Doc top level index missing" "[ -f build/doc/index.html ]" + assertFalse "Doxyfile found in build" "[ -f build/doc/test.dxy ]" + assertTrue "Doc index file missing" "[ -f build/doc/html/index.html ]" + assertTrue "Header file missing" "[ -f build/inc/test.h ]" + assertEquals "test.h seems not patched" "13" "$(stat -c "%s" build/inc/test.h)" + assertTrue "Source file missing" "[ -f build/src/test.c ]" + assertEquals "test.c seems not patched" "48" "$(stat -c "%s" build/src/test.c)" + assertTrue "Source file missing" "[ -f build/src/win.c ]" + assertEquals "win.c seems not patched" "50" "$(stat -c "%s" build/src/win.c)" + assertTrue "Source file missing" "[ -f build/src/mac.c ]" + assertEquals "mac.c seems not patched" "47" "$(stat -c "%s" build/src/mac.c)" + assertTrue "Pack archive missing" "[ -f output/ARM.GenPack.1.0.1-dev1.pack ]" + + assertTrue "Checksum file verification failed" "cd build; sha1sum ARM.GenPack.sha1" pdsc=$(cat build/ARM.GenPack.pdsc) assertContains "$pdsc" '' @@ -64,7 +78,7 @@ test_integ_with_git_release() { git --git-dir="$(pwd)/.git" clean -fdxq git --git-dir="$(pwd)/.git" checkout -fq v1.0.0 - ./gen_pack.sh -k + ./gen_pack.sh --verbose -k assertTrue "Pack description file missing" "[ -f build/ARM.GenPack.pdsc ]" assertTrue "Pack checksum file missing" "[ -f build/ARM.GenPack.sha1 ]" @@ -98,7 +112,7 @@ test_integ_with_git_prerelease() { export GIT_COMMITTER_DATE="2022-08-04T16:00:00Z" git --git-dir="$(pwd)/.git" tag -m "Active development ..." v1.0.0-dev v1.0.0^ - ./gen_pack.sh -k + ./gen_pack.sh --verbose -k assertTrue "Pack description file missing" "[ -f build/ARM.GenPack.pdsc ]" assertTrue "Pack checksum file missing" "[ -f build/ARM.GenPack.sha1 ]" @@ -127,7 +141,7 @@ test_integ_with_git_devdrop() { git --git-dir="$(pwd)/.git" clean -fdxq git --git-dir="$(pwd)/.git" checkout -fq main - ./gen_pack.sh -k + ./gen_pack.sh --verbose -k assertTrue "Pack description file missing" "[ -f build/ARM.GenPack.pdsc ]" assertTrue "Pack checksum file missing" "[ -f build/ARM.GenPack.sha1 ]" @@ -156,7 +170,7 @@ test_integ_with_git_v2_dev() { git --git-dir="$(pwd)/.git" clean -fdxq git --git-dir="$(pwd)/.git" checkout -fq v2 - ./gen_pack.sh -k + ./gen_pack.sh --verbose -k assertTrue "Pack description file missing" "[ -f build/ARM.GenPack.pdsc ]" assertTrue "Pack checksum file missing" "[ -f build/ARM.GenPack.sha1 ]"