diff options
| -rw-r--r-- | meta-agl-test/recipes-external/tar/files/0001-tests-fix-TESTSUITE_AT.patch | 42 | ||||
| -rw-r--r-- | meta-agl-test/recipes-external/tar/files/0002-tests-check-for-recently-fixed-bug.patch | 8 | ||||
| -rw-r--r-- | meta-agl-test/recipes-external/tar/files/0003-Exclude-VCS-directory-with-writing-from-an-archive.patch | 8 | ||||
| -rw-r--r-- | meta-agl-test/recipes-external/tar/files/0004-disable-sparse05.patch | 19 | ||||
| -rw-r--r-- | meta-agl-test/recipes-external/tar/tar_1.35.bbappend (renamed from meta-agl-test/recipes-external/tar/tar_1.34.bbappend) | 6 |
5 files changed, 57 insertions, 26 deletions
diff --git a/meta-agl-test/recipes-external/tar/files/0001-tests-fix-TESTSUITE_AT.patch b/meta-agl-test/recipes-external/tar/files/0001-tests-fix-TESTSUITE_AT.patch index 2b4af8db..27d4d9ae 100644 --- a/meta-agl-test/recipes-external/tar/files/0001-tests-fix-TESTSUITE_AT.patch +++ b/meta-agl-test/recipes-external/tar/files/0001-tests-fix-TESTSUITE_AT.patch @@ -14,10 +14,11 @@ Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/tar.git/commit/?id= tests/Makefile.am | 93 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 45 deletions(-) -diff -rNu a/tests/Makefile.am b/tests/Makefile.am ---- a/tests/Makefile.am 2023-09-28 01:13:15.504997461 +0000 -+++ b/tests/Makefile.am 2023-09-28 01:36:29.348977229 +0000 -@@ -45,21 +45,24 @@ +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 4a8f501..1884b72 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -45,21 +45,24 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac ## Test suite. ## ## ------------ ## @@ -47,7 +48,7 @@ diff -rNu a/tests/Makefile.am b/tests/Makefile.am add-file.at\ append.at\ append01.at\ -@@ -68,20 +71,23 @@ +@@ -68,14 +71,15 @@ TESTSUITE_AT = \ append04.at\ append05.at\ backup01.at\ @@ -68,15 +69,16 @@ diff -rNu a/tests/Makefile.am b/tests/Makefile.am delete01.at\ delete02.at\ delete03.at\ - delete04.at\ +@@ -83,6 +87,8 @@ TESTSUITE_AT = \ delete05.at\ + delete06.at\ difflink.at\ + dirrem01.at\ + dirrem02.at\ exclude.at\ exclude01.at\ exclude02.at\ -@@ -99,6 +105,8 @@ +@@ -100,6 +106,8 @@ TESTSUITE_AT = \ exclude14.at\ exclude15.at\ exclude16.at\ @@ -85,8 +87,8 @@ diff -rNu a/tests/Makefile.am b/tests/Makefile.am extrac01.at\ extrac02.at\ extrac03.at\ -@@ -125,11 +133,9 @@ - extrac24.at\ +@@ -127,11 +135,9 @@ TESTSUITE_AT = \ + extrac25.at\ filerem01.at\ filerem02.at\ - dirrem01.at\ @@ -99,7 +101,7 @@ diff -rNu a/tests/Makefile.am b/tests/Makefile.am incr01.at\ incr02.at\ incr03.at\ -@@ -141,8 +147,8 @@ +@@ -143,8 +149,8 @@ TESTSUITE_AT = \ incr09.at\ incr10.at\ incr11.at\ @@ -109,7 +111,7 @@ diff -rNu a/tests/Makefile.am b/tests/Makefile.am label01.at\ label02.at\ label03.at\ -@@ -186,22 +192,16 @@ +@@ -188,22 +194,16 @@ TESTSUITE_AT = \ opcomp04.at\ opcomp05.at\ opcomp06.at\ @@ -136,7 +138,7 @@ diff -rNu a/tests/Makefile.am b/tests/Makefile.am remfiles01.at\ remfiles02.at\ remfiles03.at\ -@@ -224,11 +224,19 @@ +@@ -226,11 +226,19 @@ TESTSUITE_AT = \ remfiles09b.at\ remfiles09c.at\ remfiles10.at\ @@ -157,7 +159,7 @@ diff -rNu a/tests/Makefile.am b/tests/Makefile.am sigpipe.at\ sparse01.at\ sparse02.at\ -@@ -245,6 +253,13 @@ +@@ -247,6 +255,13 @@ TESTSUITE_AT = \ sptrcreat.at\ sptrdiff00.at\ sptrdiff01.at\ @@ -171,10 +173,10 @@ diff -rNu a/tests/Makefile.am b/tests/Makefile.am time01.at\ time02.at\ truncate.at\ -@@ -252,21 +267,11 @@ - update01.at\ +@@ -255,21 +270,11 @@ TESTSUITE_AT = \ update02.at\ update03.at\ + update04.at\ - volsize.at\ - volume.at\ verbose.at\ @@ -195,10 +197,10 @@ diff -rNu a/tests/Makefile.am b/tests/Makefile.am xattr01.at\ xattr02.at\ xattr03.at\ -@@ -274,12 +279,11 @@ - xattr05.at\ +@@ -278,12 +283,10 @@ TESTSUITE_AT = \ xattr06.at\ xattr07.at\ + xattr08.at\ - acls01.at\ - acls02.at\ - acls03.at\ @@ -209,11 +211,10 @@ diff -rNu a/tests/Makefile.am b/tests/Makefile.am + xform01.at\ + xform02.at\ + xform03.at -+ distclean-local: -rm -rf download -@@ -287,7 +291,7 @@ +@@ -291,7 +294,7 @@ distclean-local: TESTSUITE = $(srcdir)/testsuite AUTOTEST = $(AUTOM4TE) --language=autotest @@ -222,3 +223,6 @@ diff -rNu a/tests/Makefile.am b/tests/Makefile.am $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp mv $@.tmp $@ +-- +cgit v1.1 + diff --git a/meta-agl-test/recipes-external/tar/files/0002-tests-check-for-recently-fixed-bug.patch b/meta-agl-test/recipes-external/tar/files/0002-tests-check-for-recently-fixed-bug.patch index 5b9a0c63..6cd8c551 100644 --- a/meta-agl-test/recipes-external/tar/files/0002-tests-check-for-recently-fixed-bug.patch +++ b/meta-agl-test/recipes-external/tar/files/0002-tests-check-for-recently-fixed-bug.patch @@ -1,8 +1,14 @@ -tests: check for recently-fixed bug +From 0f0722df45ec520d0dac7c9ad7e69165e9140931 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Fri, 7 Oct 2022 15:22:07 -0700 +Subject: tests: check for recently-fixed bug * tests/exclude17.at: New file. Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/tar.git/commit/?id=0f0722df45ec520d0dac7c9ad7e69165e9140931] + +Signed-off-by: Qiu Tingting <qiutt@fujitsu.com> + --- tests/exclude17.at | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+) diff --git a/meta-agl-test/recipes-external/tar/files/0003-Exclude-VCS-directory-with-writing-from-an-archive.patch b/meta-agl-test/recipes-external/tar/files/0003-Exclude-VCS-directory-with-writing-from-an-archive.patch index 986c4ef7..577a9ba9 100644 --- a/meta-agl-test/recipes-external/tar/files/0003-Exclude-VCS-directory-with-writing-from-an-archive.patch +++ b/meta-agl-test/recipes-external/tar/files/0003-Exclude-VCS-directory-with-writing-from-an-archive.patch @@ -1,8 +1,14 @@ -tests: Exclude VCS directory with writing from an archive +From 4f814e0e4c673f86dc65a557f7e55f6b5efd1529 Mon Sep 17 00:00:00 2001 +From: Anton Makrushin <makrusan@gmail.com> +Date: Mon, 20 Mar 2023 20:05:42 +0530 +Subject: Exclude VCS directory with writing from an archive See https://savannah.gnu.org/bugs/?62859 Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/tar.git/commit/?id=4f814e0e4c673f86dc65a557f7e55f6b5efd1529] + +Signed-off-by: Qiu Tingting <qiutt@fujitsu.com> + --- tests/exclude18.at | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+) diff --git a/meta-agl-test/recipes-external/tar/files/0004-disable-sparse05.patch b/meta-agl-test/recipes-external/tar/files/0004-disable-sparse05.patch new file mode 100644 index 00000000..8c191abe --- /dev/null +++ b/meta-agl-test/recipes-external/tar/files/0004-disable-sparse05.patch @@ -0,0 +1,19 @@ +disable sparse05 test + +This case tests large files larger than 2 ^ 33 bytes. +Skip it because there is not enough space. + +Signed-off-by: Qiu Tingting <qiutt@fujitsu.com> +Upstream-Status: Inappropriate [AGL-Specific] + +diff -rNu a/testes/testsuite.at b/testes/testsuite.at +--- a/tests/testsuite.at 2023-11-16 09:20:03.413394950 +0800 ++++ b/tests/testsuite.at 2023-11-16 09:20:31.221395180 +0800 +@@ -439,7 +439,6 @@ + m4_include([sparse02.at]) + m4_include([sparse03.at]) + m4_include([sparse04.at]) +-m4_include([sparse05.at]) + m4_include([sparse06.at]) + m4_include([sparse07.at]) + m4_include([sparsemv.at]) diff --git a/meta-agl-test/recipes-external/tar/tar_1.34.bbappend b/meta-agl-test/recipes-external/tar/tar_1.35.bbappend index 0fcd8290..d00a61e0 100644 --- a/meta-agl-test/recipes-external/tar/tar_1.34.bbappend +++ b/meta-agl-test/recipes-external/tar/tar_1.35.bbappend @@ -9,6 +9,7 @@ SRC_URI += " \ file://0001-tests-fix-TESTSUITE_AT.patch \ file://0002-tests-check-for-recently-fixed-bug.patch \ file://0003-Exclude-VCS-directory-with-writing-from-an-archive.patch \ + file://0004-disable-sparse05.patch \ " inherit ptest @@ -37,8 +38,3 @@ do_install_ptest() { sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/run-ptest } # backport of yocto end - -# add for agl-test-framework -do_install_ptest:append() { - sed -i "s/\$at_am_msg: \$at_desc/\$at_am_msg: \$at_desc_line/g" ${D}${PTEST_PATH}/tests/testsuite -} |