From 5c2e7104e7de6ac70fae6e8d1e84c9f36c476d43 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 25 Nov 2019 13:01:05 +0100
Subject: libtests: Use '-' for TAR file names

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

Update #3818.
---
 testsuites/libtests/Makefile.am      | 48 ++++++++++++++++++------------------
 testsuites/libtests/mghttpd01/init.c |  2 +-
 testsuites/libtests/tar01/init.c     |  6 ++---
 testsuites/libtests/tar02/init.c     |  2 +-
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
index 97786ac498..889a8ad78f 100644
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -987,19 +987,19 @@ if TEST_mghttpd01
 lib_tests += mghttpd01
 lib_screens += mghttpd01/mghttpd01.scn
 lib_docs += mghttpd01/mghttpd01.doc
-mghttpd01_SOURCES = mghttpd01/init.c mghttpd01_tar.c \
-	mghttpd01_tar.h mghttpd01/test-http-client.c \
+mghttpd01_SOURCES = mghttpd01/init.c mghttpd01-tar.c \
+	mghttpd01-tar.h mghttpd01/test-http-client.c \
 	mghttpd01/test-http-client.h
 mghttpd01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mghttpd01) \
 	$(support_includes) -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
 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 $< $@
-mghttpd01_tar.h: mghttpd01/mghttpd01.tar
+mghttpd01-tar.h: mghttpd01/mghttpd01.tar
 	$(AM_V_GEN)$(BIN2C) -H $< $@
 mghttpd01-tar.o: mghttpd01-tar.c mghttpd01-tar.h
-mghttpd01/init.c: mghttpd01_tar.h
-CLEANFILES += mghttpd01.tar mghttpd01_tar.c mghttpd01_tar.h
+mghttpd01/init.c: mghttpd01-tar.h
+CLEANFILES += mghttpd01.tar mghttpd01-tar.c mghttpd01-tar.h
 endif
 endif
 endif
@@ -1281,9 +1281,9 @@ lib_tests += tar01
 lib_screens += tar01/tar01.scn
 lib_docs += tar01/tar01.doc
 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
-tar01_SOURCES += tar01_tar_xz.c tar01_tar_xz.h
+tar01_SOURCES += tar01-tar-xz.c tar01-tar-xz.h
 endif
 tar01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tar01) \
 	$(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
 	@rm -f $@
 	$(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 $< $@
-tar01_tar.h: tar01.tar
+tar01-tar.h: tar01.tar
 	$(AM_V_GEN)$(BIN2C) -H $< $@
 tar01-tar.o: tar01-tar.c tar01-tar.h
 tar01.tar.gz: tar01.tar
 	$(AM_V_GEN)$(GZIP) < $< > $@
-tar01_tar_gz.c: tar01.tar.gz
+tar01-tar-gz.c: tar01.tar.gz
 	$(AM_V_GEN)$(BIN2C) -C $< $@
-tar01_tar_gz.h: tar01.tar.gz
+tar01-tar-gz.h: tar01.tar.gz
 	$(AM_V_GEN)$(BIN2C) -H $< $@
-CLEANFILES += tar01.tar tar01_tar.c tar01_tar.h \
-	tar01.tar.gz tar01_tar_gz.c tar01_tar_gz.h
+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
 	$(AM_V_GEN)$(XZ) < $< > $@
-tar01_tar_xz.c: tar01.tar.xz
+tar01-tar-xz.c: tar01.tar.xz
 	$(AM_V_GEN)$(BIN2C) -C $< $@
-tar01_tar_xz.h: tar01.tar.xz
+tar01-tar-xz.h: tar01.tar.xz
 	$(AM_V_GEN)$(BIN2C) -H $< $@
-TAR01_XZ_H = tar01_tar_xz.h
-CLEANFILES += tar01.tar.xz tar01_tar_xz.c tar01_tar_xz.h
+TAR01_XZ_H = tar01-tar-xz.h
+CLEANFILES += tar01.tar.xz tar01-tar-xz.c tar01-tar-xz.h
 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
 
@@ -1324,19 +1324,19 @@ lib_tests += tar02
 lib_screens += tar02/tar02.scn
 lib_docs += tar02/tar02.doc
 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) \
 	$(support_includes) $(test_includes) -I$(top_srcdir)/include
 tar02.tar: Makefile
 	@rm -f $@
 	$(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 $< $@
-tar02_tar.h: tar02.tar
+tar02-tar.h: tar02.tar
 	$(AM_V_GEN)$(BIN2C) -H $< $@
 tar02-tar.o: tar02-tar.c tar02-tar.h
-tar02/init.c: tar02_tar.h
-CLEANFILES += tar02.tar tar02_tar.c tar02_tar.h
+tar02/init.c: tar02-tar.h
+CLEANFILES += tar02.tar tar02-tar.c tar02-tar.h
 endif
 endif
 
diff --git a/testsuites/libtests/mghttpd01/init.c b/testsuites/libtests/mghttpd01/init.c
index 77b52d9168..5c00dde844 100644
--- a/testsuites/libtests/mghttpd01/init.c
+++ b/testsuites/libtests/mghttpd01/init.c
@@ -28,7 +28,7 @@
 
 #include <rtems/imfs.h>
 #include <rtems/error.h>
-#include "mghttpd01_tar.h"
+#include "mghttpd01-tar.h"
 
 #include "test-http-client.h"
 
diff --git a/testsuites/libtests/tar01/init.c b/testsuites/libtests/tar01/init.c
index 39413f071b..8891911288 100644
--- a/testsuites/libtests/tar01/init.c
+++ b/testsuites/libtests/tar01/init.c
@@ -23,10 +23,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "tar01_tar.h"
-#include "tar01_tar_gz.h"
+#include "tar01-tar.h"
+#include "tar01-tar-gz.h"
 #if HAVE_XZ
-#include "tar01_tar_xz.h"
+#include "tar01-tar-xz.h"
 #endif
 
 const char rtems_test_name[] = "TAR 1";
diff --git a/testsuites/libtests/tar02/init.c b/testsuites/libtests/tar02/init.c
index c46ea917ea..689412bab5 100644
--- a/testsuites/libtests/tar02/init.c
+++ b/testsuites/libtests/tar02/init.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "tar02_tar.h"
+#include "tar02-tar.h"
 
 const char rtems_test_name[] = "TAR 2";
 
-- 
cgit v1.2.3