diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-31 09:38:46 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-31 13:18:54 +0100 |
| commit | 86711191c0a76f1889cdfaf13dbefb080436a0d5 (patch) | |
| tree | f2f836be7cdf8f4f1f1ddac6111f50069f9b2d6c | |
| parent | MUTEX(9): Allow destruction of self-owned mutexes (diff) | |
| download | rtems-libbsd-86711191c0a76f1889cdfaf13dbefb080436a0d5.tar.bz2 | |
netshell01: Avoid multiple definitions
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | freebsd-to-rtems.py | 2 | ||||
| -rw-r--r-- | testsuite/netshell01/ns_parser_vars.c | 5 |
3 files changed, 1 insertions, 8 deletions
@@ -859,8 +859,6 @@ TEST_NETSHELL01_O_FILES += testsuite/netshell01/test_main.o TEST_NETSHELL01_D_FILES += testsuite/netshell01/test_main.d TEST_NETSHELL01_O_FILES += testsuite/netshell01/shellconfig.o TEST_NETSHELL01_D_FILES += testsuite/netshell01/shellconfig.d -TEST_NETSHELL01_O_FILES += testsuite/netshell01/ns_parser_vars.o -TEST_NETSHELL01_D_FILES += testsuite/netshell01/ns_parser_vars.d $(TEST_NETSHELL01): $(TEST_NETSHELL01_O_FILES) $(LIB) $(LINK.c) -Wl,-Map,testsuite/netshell01/netshell01.map $^ -lm -lz -o $@ TESTS += $(TEST_NETSHELL01) diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py index 9dd91179..6823ec85 100755 --- a/freebsd-to-rtems.py +++ b/freebsd-to-rtems.py @@ -2350,7 +2350,7 @@ tests.addTest('syscalls01', ['test_main']) tests.addTest('commands01', ['test_main']) tests.addTest('usb01', ['init', 'test-file-system'], False) tests.addTest('loopback01', ['test_main']) -tests.addTest('netshell01', ['test_main', 'shellconfig', 'ns_parser_vars'], False) +tests.addTest('netshell01', ['test_main', 'shellconfig'], False) tests.addTest('swi01', ['init', 'swi_test']) tests.addTest('timeout01', ['init', 'timeout_test']) tests.addTest('init01', ['test_main']) diff --git a/testsuite/netshell01/ns_parser_vars.c b/testsuite/netshell01/ns_parser_vars.c deleted file mode 100644 index b68351ee..00000000 --- a/testsuite/netshell01/ns_parser_vars.c +++ /dev/null @@ -1,5 +0,0 @@ -#include <stdio.h> - -char *_nsyytext = (char *)0xc5c5c5c5; -char *__libipsecyytext = (char *)0xc5c5c5c5; - |