[PATCH] libtests/tar0[12]: Add tar archive

[Chris Johns]

OK to push to master for 5.1. This is a nice solution.

Thanks
Chris

On 6/5/20 3:36 pm, Sebastian Huber wrote:
> Do not generate the test tar archive on the host computer since not all
> file systems support symbolic links.
> 
> Close #3968.
> ---
>   testsuites/libtests/Makefile.am     |  18 ++++++------------
>   testsuites/libtests/configure.ac    |   3 +--
>   testsuites/libtests/tar01/tar01.tar | Bin 0 -> 10240 bytes
>   testsuites/libtests/tar02/init.c    |   4 ++--
>   4 files changed, 9 insertions(+), 16 deletions(-)
>   create mode 100644 testsuites/libtests/tar01/tar01.tar
> 
> diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
> index 3ad79e93d5..7ac9993338 100644
> --- a/testsuites/libtests/Makefile.am
> +++ b/testsuites/libtests/Makefile.am
> @@ -1271,15 +1271,12 @@ endif
>   tar01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tar01) \
>   	$(support_includes) $(test_includes) -I$(top_srcdir)/include
>   tar01_LDADD = $(RTEMS_ROOT)cpukit/librtemscpu.a $(RTEMS_ROOT)cpukit/libz.a $(LDADD)
> -tar01.tar: $(srcdir)/tar01/home/test_file $(srcdir)/tar01/home/abc/def/test_script $(srcdir)/tar01/symlink
> -	@rm -f $@
> -	$(AM_V_GEN)$(PAX) -w -f $@ -s ,$(srcdir)/tar01/,, $+
> -tar01-tar.c: tar01.tar
> +tar01-tar.c: tar01/tar01.tar
>   	$(AM_V_GEN)$(BIN2C) -C $< $@
> -tar01-tar.h: tar01.tar
> +tar01-tar.h: tar01/tar01.tar
>   	$(AM_V_GEN)$(BIN2C) -H $< $@
>   tar01-tar.o: tar01-tar.c tar01-tar.h
> -tar01.tar.gz: tar01.tar
> +tar01.tar.gz: tar01/tar01.tar
>   	$(AM_V_GEN)$(GZIP) < $< > $@
>   tar01-tar-gz.c: tar01.tar.gz
>   	$(AM_V_GEN)$(BIN2C) -C $< $@
> @@ -1288,7 +1285,7 @@ tar01-tar-gz.h: tar01.tar.gz
>   CLEANFILES += tar01.tar tar01-tar.c tar01-tar.h \
>   	tar01.tar.gz tar01-tar-gz.c tar01-tar-gz.h
>   if TARTEST_XZ
> -tar01.tar.xz: tar01.tar
> +tar01.tar.xz: tar01/tar01.tar
>   	$(AM_V_GEN)$(XZ) < $< > $@
>   tar01-tar-xz.c: tar01.tar.xz
>   	$(AM_V_GEN)$(BIN2C) -C $< $@
> @@ -1310,12 +1307,9 @@ tar02_SOURCES = tar02/init.c ../psxtests/psxfile01/test_cat.c \
>   	tar02-tar.c tar02-tar.h
>   tar02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tar02) \
>   	$(support_includes) $(test_includes) -I$(top_srcdir)/include
> -tar02.tar: $(srcdir)/tar01/home/test_file $(srcdir)/tar01/home/abc/def/test_script $(srcdir)/tar01/symlink
> -	@rm -f $@
> -	$(AM_V_GEN)$(PAX) -w -f $@ -s ,$(srcdir)/tar01/,, $+
> -tar02-tar.c: tar02.tar
> +tar02-tar.c: tar01/tar01.tar
>   	$(AM_V_GEN)$(BIN2C) -C $< $@
> -tar02-tar.h: tar02.tar
> +tar02-tar.h: tar01/tar01.tar
>   	$(AM_V_GEN)$(BIN2C) -H $< $@
>   tar02-tar.o: tar02-tar.c tar02-tar.h
>   tar02/init.c: tar02-tar.h
> diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac
> index a2d9b8e734..2fbcb61622 100644
> --- a/testsuites/libtests/configure.ac
> +++ b/testsuites/libtests/configure.ac
> @@ -30,7 +30,6 @@ RTEMS_CHECK_CXX(RTEMS_BSP)
>   RTEMS_CHECK_CPUOPTS([RTEMS_NETWORKING])
>   RTEMS_CHECK_CPUOPTS([RTEMS_POSIX_API])
>   
> -AC_PROG_LN_S
>   AC_PATH_PROG([PAX],[pax],no)
>   AC_PATH_PROG([GZIP],[gzip],no)
>   AC_PATH_PROG([XZ],[xz],no)
> @@ -39,7 +38,7 @@ AS_IF([test "x$PAX" = "xno"],[
>   	AC_MSG_ERROR([pax is missing.])
>   ])
>   
> -AM_CONDITIONAL(TARTESTS,test "$as_ln_s" = "ln -s" && test -n "$PAX" && test -n "$GZIP")
> +AM_CONDITIONAL(TARTESTS,test -n "$PAX" && test -n "$GZIP")
>   AM_CONDITIONAL(TARTEST_XZ,test -n "$XZ")
>   
>   AM_CONDITIONAL(HAS_CXX,test "$rtems_cv_HAS_CPLUSPLUS" = "yes")
> diff --git a/testsuites/libtests/tar01/tar01.tar b/testsuites/libtests/tar01/tar01.tar
> new file mode 100644
> index 0000000000000000000000000000000000000000..6c6952ef183d51a9635c6ebbc8ed0443e8da1725
> GIT binary patch
> literal 10240
> zcmeI!-)h1z6b5jw`xIyFdh?`zpJ11}*}Ru%Q=2VqM^7F2_Dfp^QXGoV;n)`hsW~ah
> z&wOdirZUUUNVhJmGmBXo`<BKrF^5qc^3iwS!>p7d6{RW-lY}|){VG$LubX8ylbi0P
> z)9r#;%tlLRb-gYp72{>zRNB_G7t_kAf^jMR;)X`2YHskiRcVF%M^nEEs42)bI=A(X
> zbWJa-r{`DdH-;RfGZhtWQ~8d-*49%w@^oY?y)%!&4XzDSIxkT6`PZB6GB?F|4#>8(
> zAKm$pmsj+G$dcqJ_uuEhm=z9_N&Z8{afbX~PJDIc{T;nE#syC3!D%7C4?dCQt2zJN
> zKsi*-*6*{<d&qz0^Zdi}-}g`R&nYJq4u{jsFDL)}`9JF)kDEgP0uX=z1Rwwb2tWV=
> g5P$##AOHafKmY;|fB*y_009U<00Izzz^@5>0Tj at K8~^|S
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/testsuites/libtests/tar02/init.c b/testsuites/libtests/tar02/init.c
> index 7a1395b873..809923719b 100644
> --- a/testsuites/libtests/tar02/init.c
> +++ b/testsuites/libtests/tar02/init.c
> @@ -32,8 +32,8 @@ const char rtems_test_name[] = "TAR 2";
>   rtems_task Init(rtems_task_argument argument);
>   void test_tarfs_load(void);
>   
> -#define TARFILE_START tar02_tar
> -#define TARFILE_SIZE  tar02_tar_size
> +#define TARFILE_START tar01_tar
> +#define TARFILE_SIZE  tar01_tar_size
>   
>   static const char file[] = "/home/test_file";
>   
>