RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

libtests: Use '-' for TAR file names

Browse Source 
Use uniform pattern for all TAR file names.  Use the dl* tests as a
template.

Update #3818.
This commit is contained in:
Sebastian Huber
2019-11-25 13:01:05 +01:00
parent 8f021bdbf9
commit 5c2e7104e7
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
testsuites/libtests/Makefile.am
View File

@@ -987,19 +987,19 @@ if TEST_mghttpd01
lib_tests += mghttpd01 lib_tests += mghttpd01
lib_screens += mghttpd01/mghttpd01.scn lib_screens += mghttpd01/mghttpd01.scn
lib_docs += mghttpd01/mghttpd01.doc lib_docs += mghttpd01/mghttpd01.doc
mghttpd01_SOURCES = mghttpd01/init.c mghttpd01_tar.c \ mghttpd01_SOURCES = mghttpd01/init.c mghttpd01-tar.c \
mghttpd01_tar.h mghttpd01/test-http-client.c \ mghttpd01-tar.h mghttpd01/test-http-client.c \
mghttpd01/test-http-client.h mghttpd01/test-http-client.h
mghttpd01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mghttpd01) \ mghttpd01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mghttpd01) \
$(support_includes) -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking $(support_includes) -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
mghttpd01_LDADD = $(RTEMS_ROOT)cpukit/libmghttpd.a $(LDADD) mghttpd01_LDADD = $(RTEMS_ROOT)cpukit/libmghttpd.a $(LDADD)
mghttpd01_tar.c: mghttpd01/mghttpd01.tar mghttpd01-tar.c: mghttpd01/mghttpd01.tar
$(AM_V_GEN)$(BIN2C) -C $< $@ $(AM_V_GEN)$(BIN2C) -C $< $@
mghttpd01_tar.h: mghttpd01/mghttpd01.tar mghttpd01-tar.h: mghttpd01/mghttpd01.tar
$(AM_V_GEN)$(BIN2C) -H $< $@ $(AM_V_GEN)$(BIN2C) -H $< $@
mghttpd01-tar.o: mghttpd01-tar.c mghttpd01-tar.h mghttpd01-tar.o: mghttpd01-tar.c mghttpd01-tar.h
mghttpd01/init.c: mghttpd01_tar.h mghttpd01/init.c: mghttpd01-tar.h
CLEANFILES += mghttpd01.tar mghttpd01_tar.c mghttpd01_tar.h CLEANFILES += mghttpd01.tar mghttpd01-tar.c mghttpd01-tar.h
endif endif
endif endif
endif endif
@@ -1281,9 +1281,9 @@ lib_tests += tar01
lib_screens += tar01/tar01.scn lib_screens += tar01/tar01.scn
lib_docs += tar01/tar01.doc lib_docs += tar01/tar01.doc
tar01_SOURCES = tar01/init.c ../psxtests/psxfile01/test_cat.c \ tar01_SOURCES = tar01/init.c ../psxtests/psxfile01/test_cat.c \
tar01_tar.c tar01_tar.h tar01_tar_gz.c tar01_tar_gz.h tar01-tar.c tar01-tar.h tar01-tar-gz.c tar01-tar-gz.h
if TARTEST_XZ if TARTEST_XZ
tar01_SOURCES += tar01_tar_xz.c tar01_tar_xz.h tar01_SOURCES += tar01-tar-xz.c tar01-tar-xz.h
endif endif
tar01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tar01) \ tar01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tar01) \
$(support_includes) $(test_includes) -I$(top_srcdir)/include $(support_includes) $(test_includes) -I$(top_srcdir)/include
@@ -1291,30 +1291,30 @@ tar01_LDADD = $(RTEMS_ROOT)cpukit/librtemscpu.a $(RTEMS_ROOT)cpukit/libz.a $(LDA
tar01.tar: Makefile tar01.tar: Makefile
@rm -f $@ @rm -f $@
$(AM_V_GEN)$(PAX) -w -f $@ -s ,$(srcdir)/tar01/,, $(srcdir)/tar01/home $(srcdir)/tar01/symlink $(AM_V_GEN)$(PAX) -w -f $@ -s ,$(srcdir)/tar01/,, $(srcdir)/tar01/home $(srcdir)/tar01/symlink
tar01_tar.c: tar01.tar tar01-tar.c: tar01.tar
$(AM_V_GEN)$(BIN2C) -C $< $@ $(AM_V_GEN)$(BIN2C) -C $< $@
tar01_tar.h: tar01.tar tar01-tar.h: tar01.tar
$(AM_V_GEN)$(BIN2C) -H $< $@ $(AM_V_GEN)$(BIN2C) -H $< $@
tar01-tar.o: tar01-tar.c tar01-tar.h tar01-tar.o: tar01-tar.c tar01-tar.h
tar01.tar.gz: tar01.tar tar01.tar.gz: tar01.tar
$(AM_V_GEN)$(GZIP) < $< > $@ $(AM_V_GEN)$(GZIP) < $< > $@
tar01_tar_gz.c: tar01.tar.gz tar01-tar-gz.c: tar01.tar.gz
$(AM_V_GEN)$(BIN2C) -C $< $@ $(AM_V_GEN)$(BIN2C) -C $< $@
tar01_tar_gz.h: tar01.tar.gz tar01-tar-gz.h: tar01.tar.gz
$(AM_V_GEN)$(BIN2C) -H $< $@ $(AM_V_GEN)$(BIN2C) -H $< $@
CLEANFILES += tar01.tar tar01_tar.c tar01_tar.h \ CLEANFILES += tar01.tar tar01-tar.c tar01-tar.h \
tar01.tar.gz tar01_tar_gz.c tar01_tar_gz.h tar01.tar.gz tar01-tar-gz.c tar01-tar-gz.h
if TARTEST_XZ if TARTEST_XZ
tar01.tar.xz: tar01.tar tar01.tar.xz: tar01.tar
$(AM_V_GEN)$(XZ) < $< > $@ $(AM_V_GEN)$(XZ) < $< > $@
tar01_tar_xz.c: tar01.tar.xz tar01-tar-xz.c: tar01.tar.xz
$(AM_V_GEN)$(BIN2C) -C $< $@ $(AM_V_GEN)$(BIN2C) -C $< $@
tar01_tar_xz.h: tar01.tar.xz tar01-tar-xz.h: tar01.tar.xz
$(AM_V_GEN)$(BIN2C) -H $< $@ $(AM_V_GEN)$(BIN2C) -H $< $@
TAR01_XZ_H = tar01_tar_xz.h TAR01_XZ_H = tar01-tar-xz.h
CLEANFILES += tar01.tar.xz tar01_tar_xz.c tar01_tar_xz.h CLEANFILES += tar01.tar.xz tar01-tar-xz.c tar01-tar-xz.h
endif endif
tar01/init.c: tar01_tar.h tar01_tar_gz.h $(TAR01_XZ_H) tar01/init.c: tar01-tar.h tar01-tar-gz.h $(TAR01_XZ_H)
endif endif
endif endif
@@ -1324,19 +1324,19 @@ lib_tests += tar02
lib_screens += tar02/tar02.scn lib_screens += tar02/tar02.scn
lib_docs += tar02/tar02.doc lib_docs += tar02/tar02.doc
tar02_SOURCES = tar02/init.c ../psxtests/psxfile01/test_cat.c \ tar02_SOURCES = tar02/init.c ../psxtests/psxfile01/test_cat.c \
tar02_tar.c tar02_tar.h tar02-tar.c tar02-tar.h
tar02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tar02) \ tar02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tar02) \
$(support_includes) $(test_includes) -I$(top_srcdir)/include $(support_includes) $(test_includes) -I$(top_srcdir)/include
tar02.tar: Makefile tar02.tar: Makefile
@rm -f $@ @rm -f $@
$(AM_V_GEN)$(PAX) -w -f $@ -s ,$(srcdir)/tar01/,, $(srcdir)/tar01/home $(srcdir)/tar01/symlink $(AM_V_GEN)$(PAX) -w -f $@ -s ,$(srcdir)/tar01/,, $(srcdir)/tar01/home $(srcdir)/tar01/symlink
tar02_tar.c: tar02.tar tar02-tar.c: tar02.tar
$(AM_V_GEN)$(BIN2C) -C $< $@ $(AM_V_GEN)$(BIN2C) -C $< $@
tar02_tar.h: tar02.tar tar02-tar.h: tar02.tar
$(AM_V_GEN)$(BIN2C) -H $< $@ $(AM_V_GEN)$(BIN2C) -H $< $@
tar02-tar.o: tar02-tar.c tar02-tar.h tar02-tar.o: tar02-tar.c tar02-tar.h
tar02/init.c: tar02_tar.h tar02/init.c: tar02-tar.h
CLEANFILES += tar02.tar tar02_tar.c tar02_tar.h CLEANFILES += tar02.tar tar02-tar.c tar02-tar.h
endif endif
endif endif

2
testsuites/libtests/mghttpd01/init.c
View File

@@ -28,7 +28,7 @@
#include <rtems/imfs.h> #include <rtems/imfs.h>
#include <rtems/error.h> #include <rtems/error.h>
#include "mghttpd01_tar.h" #include "mghttpd01-tar.h"
#include "test-http-client.h" #include "test-http-client.h"

6
testsuites/libtests/tar01/init.c
View File

@@ -23,10 +23,10 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include "tar01_tar.h" #include "tar01-tar.h"
#include "tar01_tar_gz.h" #include "tar01-tar-gz.h"
#if HAVE_XZ #if HAVE_XZ
#include "tar01_tar_xz.h" #include "tar01-tar-xz.h"
#endif #endif
const char rtems_test_name[] = "TAR 1"; const char rtems_test_name[] = "TAR 1";

2
testsuites/libtests/tar02/init.c
View File

@@ -24,7 +24,7 @@
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include "tar02_tar.h" #include "tar02-tar.h"
const char rtems_test_name[] = "TAR 2"; const char rtems_test_name[] = "TAR 2";