diff options
| author | Chris Johns <chrisj@rtems.org> | 2018-04-09 13:39:19 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2018-04-10 08:24:54 +1000 |
| commit | 5c65b9881bec47e322607a9a63c83d1a229c1710 (patch) | |
| tree | 18201091467d737156766d37d3608279a756f7b6 /testsuites/libtests/tar02 | |
| parent | testsuite/benchmarks: Merged nested Makefile.am files into one Makefile.am (diff) | |
| download | rtems-5c65b9881bec47e322607a9a63c83d1a229c1710.tar.bz2 | |
testsuite/libtests: Merged nested Makefile.am files into one Makefile.am
This change is part of the testsuite Makefile.am reorganization.
Update #3382
Diffstat (limited to 'testsuites/libtests/tar02')
| -rw-r--r-- | testsuites/libtests/tar02/Makefile.am | 52 | ||||
| -rw-r--r-- | testsuites/libtests/tar02/init.c | 6 |
2 files changed, 3 insertions, 55 deletions
diff --git a/testsuites/libtests/tar02/Makefile.am b/testsuites/libtests/tar02/Makefile.am deleted file mode 100644 index 67a4136570..0000000000 --- a/testsuites/libtests/tar02/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -if TARTESTS -rtems_tests_PROGRAMS = tar02 -tar02_SOURCES = init.c ../../psxtests/psxfile01/test_cat.c \ - initial_filesystem_tar.c initial_filesystem_tar.h - -BUILT_SOURCES = initial_filesystem_tar.c initial_filesystem_tar.h - -dist_rtems_tests_DATA = tar02.scn -dist_rtems_tests_DATA += tar02.doc -endif - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/leaf.am - -if TARTESTS -AM_CPPFLAGS += -I$(top_srcdir)/include -AM_CPPFLAGS += -I$(top_srcdir)/../support/include -AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include - -LINK_OBJS = $(tar02_OBJECTS) -LINK_LIBS = $(tar02_LDLIBS) - -tar02$(EXEEXT): $(tar02_OBJECTS) $(tar02_DEPENDENCIES) - @rm -f tar02$(EXEEXT) - $(make-exe) - -init.$(OBJEXT): initial_filesystem_tar.h - -initial_filesystem_tar.c: initial_filesystem.tar - $(BIN2C) -C initial_filesystem.tar initial_filesystem_tar -CLEANFILES += initial_filesystem_tar.c - -initial_filesystem_tar.h: initial_filesystem.tar - $(BIN2C) -H initial_filesystem.tar initial_filesystem_tar -CLEANFILES += initial_filesystem_tar.h - -initial_filesystem.tar: - rm -rf initial_fs - $(MKDIR_P) initial_fs/home - (echo "This is a test of loading an RTEMS filesystem from an" ; \ - echo "initial tar image.") >initial_fs/home/test_file - (cd initial_fs; \ - $(LN_S) home/test_file symlink; \ - $(PAX) -w -f ../initial_filesystem.tar home symlink) -CLEANFILES += initial_filesystem.tar -endif TARTESTS - -clean-local: - -rm -rf initial_fs - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/libtests/tar02/init.c b/testsuites/libtests/tar02/init.c index 45dfa35a18..c46ea917ea 100644 --- a/testsuites/libtests/tar02/init.c +++ b/testsuites/libtests/tar02/init.c @@ -24,7 +24,7 @@ #include <unistd.h> #include <string.h> -#include "initial_filesystem_tar.h" +#include "tar02_tar.h" const char rtems_test_name[] = "TAR 2"; @@ -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 initial_filesystem_tar -#define TARFILE_SIZE initial_filesystem_tar_size +#define TARFILE_START tar02_tar +#define TARFILE_SIZE tar02_tar_size static const char file[] = "/home/test_file"; |