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/mghttpd01 | |
| 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/mghttpd01')
| -rw-r--r-- | testsuites/libtests/mghttpd01/Makefile.am | 34 | ||||
| -rw-r--r-- | testsuites/libtests/mghttpd01/init.c | 8 | ||||
| -rw-r--r-- | testsuites/libtests/mghttpd01/mghttpd01.tar (renamed from testsuites/libtests/mghttpd01/init_fs.tar) | bin | 10240 -> 10240 bytes |
3 files changed, 4 insertions, 38 deletions
diff --git a/testsuites/libtests/mghttpd01/Makefile.am b/testsuites/libtests/mghttpd01/Makefile.am deleted file mode 100644 index d3c89d86ca..0000000000 --- a/testsuites/libtests/mghttpd01/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -rtems_tests_PROGRAMS = mghttpd01 - -mghttpd01_SOURCES = init.c init_fs.c init_fs.h \ - test-http-client.c test-http-client.h -mghttpd01_LDADD = -lmghttpd -BUILT_SOURCES = init_fs.c init_fs.h - -dist_rtems_tests_DATA = mghttpd01.scn mghttpd01.doc - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/leaf.am - -AM_CPPFLAGS += -I$(top_srcdir)/../support/include -AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking - -LINK_OBJS = $(mghttpd01_OBJECTS) $(mghttpd01_LDADD) -LINK_LIBS = $(mghttpd01_LDLIBS) - -mghttpd01$(EXEEXT): $(mghttpd01_OBJECTS) $(mghttpd01_DEPENDENCIES) - @rm -f mghttpd01$(EXEEXT) - $(make-exe) - -init.$(OBJEXT): init_fs.h - -init_fs.c: - $(BIN2C) -C $(srcdir)/init_fs.tar init_fs -CLEANFILES += init_fs.c - -init_fs.h: - $(BIN2C) -H $(srcdir)/init_fs.tar init_fs -CLEANFILES += init_fs.h - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/libtests/mghttpd01/init.c b/testsuites/libtests/mghttpd01/init.c index d3f18feb63..77b52d9168 100644 --- a/testsuites/libtests/mghttpd01/init.c +++ b/testsuites/libtests/mghttpd01/init.c @@ -28,14 +28,14 @@ #include <rtems/imfs.h> #include <rtems/error.h> -#include "init_fs.h" +#include "mghttpd01_tar.h" #include "test-http-client.h" const char rtems_test_name[] = "MGHTTPD 1"; -#define TARFILE_START init_fs_tar -#define TARFILE_SIZE init_fs_tar_size +#define TARFILE_START mghttpd01_tar +#define TARFILE_SIZE mghttpd01_tar_size #define CBACKTEST_URI "/callbacktest.txt" #define CBACKTEST_TXT "HTTP/1.1 200 OK\r\n" \ @@ -264,7 +264,7 @@ static void Init(rtems_task_argument arg) TEST_END(); - rtems_test_exit(0); + rtems_test_exit(0); } #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER diff --git a/testsuites/libtests/mghttpd01/init_fs.tar b/testsuites/libtests/mghttpd01/mghttpd01.tar Binary files differindex 67132d5122..67132d5122 100644 --- a/testsuites/libtests/mghttpd01/init_fs.tar +++ b/testsuites/libtests/mghttpd01/mghttpd01.tar |