summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2017-05-23 13:18:31 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2017-06-08 13:19:54 +0200
commit02373194fe0be1ef82db419bedbf9d6ffd31dc93 (patch)
treef151591d23221ec221c57496d07f7fba8dff137a /testsuite
parent29c0cffe57a04e487f5a5a61f7d12e5e067712a0 (diff)
Update due to Newlib 2017-06-07 changes
The following files are now provided by Newlib: * arpa/inet.h * net/if.h * netinet/in.h * netinet/tcp.h * sys/socket.h * sys/uio.h * sys/un.h The <sys/param.h> and <sys/cpuset.h> are now compatible enough to be used directly. Update #2833.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/commands01/test_main.c2
-rw-r--r--testsuite/condvar01/test_main.c2
-rw-r--r--testsuite/loopback01/test_main.c2
-rw-r--r--testsuite/mutex01/test_main.c2
-rw-r--r--testsuite/netshell01/test_main.c1
-rw-r--r--testsuite/rcconf01/test_main.c2
-rw-r--r--testsuite/rcconf02/test_main.c2
-rw-r--r--testsuite/rwlock01/test_main.c2
-rwxr-xr-xtestsuite/selectpollkqueue01/test_main.c2
-rw-r--r--testsuite/sleep01/test_main.c2
-rw-r--r--testsuite/smp01/test_main.c2
-rw-r--r--testsuite/termios/test_main.c84
-rw-r--r--testsuite/termios/test_termios_utilities.c2
-rw-r--r--testsuite/termios06/test_main.c4
-rw-r--r--testsuite/thread01/test_main.c2
-rw-r--r--testsuite/timeout01/timeout_test.c2
-rw-r--r--testsuite/unix01/test_main.c2
17 files changed, 19 insertions, 98 deletions
diff --git a/testsuite/commands01/test_main.c b/testsuite/commands01/test_main.c
index e4747857..f0ddab50 100644
--- a/testsuite/commands01/test_main.c
+++ b/testsuite/commands01/test_main.c
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <assert.h>
#include <errno.h>
diff --git a/testsuite/condvar01/test_main.c b/testsuite/condvar01/test_main.c
index 3c230dc3..9cd20cb3 100644
--- a/testsuite/condvar01/test_main.c
+++ b/testsuite/condvar01/test_main.c
@@ -31,7 +31,7 @@
#include <machine/rtems-bsd-kernel-space.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/systm.h>
#include <rtems/bsd/sys/lock.h>
diff --git a/testsuite/loopback01/test_main.c b/testsuite/loopback01/test_main.c
index 5639d5d8..f0453e69 100644
--- a/testsuite/loopback01/test_main.c
+++ b/testsuite/loopback01/test_main.c
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/testsuite/mutex01/test_main.c b/testsuite/mutex01/test_main.c
index 7cc29e4c..8d871c9d 100644
--- a/testsuite/mutex01/test_main.c
+++ b/testsuite/mutex01/test_main.c
@@ -31,7 +31,7 @@
#include <machine/rtems-bsd-kernel-space.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/systm.h>
#include <rtems/bsd/sys/lock.h>
diff --git a/testsuite/netshell01/test_main.c b/testsuite/netshell01/test_main.c
index 1b68971d..5fda46c2 100644
--- a/testsuite/netshell01/test_main.c
+++ b/testsuite/netshell01/test_main.c
@@ -38,6 +38,7 @@
#include <string.h>
#include <rtems/shell.h>
+#include <rtems/termiostypes.h>
#define TEST_NAME "LIBBSD NETSHELL 1"
diff --git a/testsuite/rcconf01/test_main.c b/testsuite/rcconf01/test_main.c
index 51723bc7..4701390c 100644
--- a/testsuite/rcconf01/test_main.c
+++ b/testsuite/rcconf01/test_main.c
@@ -23,7 +23,7 @@
* SUCH DAMAGE.
*/
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <assert.h>
#include <ctype.h>
diff --git a/testsuite/rcconf02/test_main.c b/testsuite/rcconf02/test_main.c
index ad177d25..c3a85df1 100644
--- a/testsuite/rcconf02/test_main.c
+++ b/testsuite/rcconf02/test_main.c
@@ -48,7 +48,7 @@
* 4. ftpd
*/
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <assert.h>
#include <ctype.h>
diff --git a/testsuite/rwlock01/test_main.c b/testsuite/rwlock01/test_main.c
index d515fe7d..071f339c 100644
--- a/testsuite/rwlock01/test_main.c
+++ b/testsuite/rwlock01/test_main.c
@@ -31,7 +31,7 @@
#include <machine/rtems-bsd-kernel-space.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/systm.h>
#include <rtems/bsd/sys/lock.h>
diff --git a/testsuite/selectpollkqueue01/test_main.c b/testsuite/selectpollkqueue01/test_main.c
index c45fff78..8af59bf9 100755
--- a/testsuite/selectpollkqueue01/test_main.c
+++ b/testsuite/selectpollkqueue01/test_main.c
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/event.h>
#include <sys/filio.h>
diff --git a/testsuite/sleep01/test_main.c b/testsuite/sleep01/test_main.c
index 08b7dcd1..00fbb91b 100644
--- a/testsuite/sleep01/test_main.c
+++ b/testsuite/sleep01/test_main.c
@@ -31,7 +31,7 @@
#include <machine/rtems-bsd-kernel-space.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/systm.h>
#include <rtems/bsd/sys/lock.h>
#include <sys/mutex.h>
diff --git a/testsuite/smp01/test_main.c b/testsuite/smp01/test_main.c
index 54bfab19..f8c0df2c 100644
--- a/testsuite/smp01/test_main.c
+++ b/testsuite/smp01/test_main.c
@@ -31,7 +31,7 @@
#include <machine/rtems-bsd-kernel-space.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/systm.h>
#include <rtems/bsd/sys/lock.h>
diff --git a/testsuite/termios/test_main.c b/testsuite/termios/test_main.c
index 90e33826..6a4431b9 100644
--- a/testsuite/termios/test_main.c
+++ b/testsuite/termios/test_main.c
@@ -13,6 +13,7 @@
#include <rtems/console.h>
#include <rtems/shell.h>
+#include <rtems/termiostypes.h>
#include <rtems/bsd/bsd.h>
#include <termios.h>
@@ -113,87 +114,6 @@ void print_c_oflag( struct termios * tp )
if( tp->c_oflag & ONLRET )
printf( "ONLRET " );
- if( tp->c_oflag & OFILL )
- printf( "OFILL " );
-
- if( tp->c_oflag & OFDEL )
- printf( "OFDEL " );
-
- switch( tp->c_oflag & NLDLY ) {
- case NL0:
- printf( "NL0 " );
- break;
-
- case NL1:
- printf( "NL1 " );
- break;
- }
-
- switch( tp->c_oflag & CRDLY ) {
- case CR0:
- printf( "CR0 " );
- break;
-
- case CR1:
- printf( "CR1 " );
- break;
-
- case CR2:
- printf( "CR2 " );
- break;
-
- case CR3:
- printf( "CR3 " );
- break;
- }
-
- switch( tp->c_oflag & TABDLY ) {
- case TAB0:
- printf( "TAB0 " );
- break;
-
- case TAB1:
- printf( "TAB1 " );
- break;
-
- case TAB2:
- printf( "TAB2 " );
- break;
-
- case TAB3:
- printf( "TAB3 " );
- break;
- }
-
- switch( tp->c_oflag & BSDLY ) {
- case BS0:
- printf( "BS0 " );
- break;
-
- case BS1:
- printf( "BS1 " );
- break;
- }
-
- switch( tp->c_oflag & VTDLY ) {
- case VT0:
- printf( "VT0 " );
- break;
-
- case VT1:
- printf( "VT1 " );
- break;
- }
-
- switch( tp->c_oflag & FFDLY ) {
- case FF0:
- printf( "FF0" );
- break;
-
- case FF1:
- printf( "FF1" );
- break;
- }
printf( "\n" );
}
@@ -853,4 +773,4 @@ test_main(void)
exit(0);
}
-#include <rtems/bsd/test/default-termios-init.h> \ No newline at end of file
+#include <rtems/bsd/test/default-termios-init.h>
diff --git a/testsuite/termios/test_termios_utilities.c b/testsuite/termios/test_termios_utilities.c
index e8caf812..e1429ef1 100644
--- a/testsuite/termios/test_termios_utilities.c
+++ b/testsuite/termios/test_termios_utilities.c
@@ -37,7 +37,7 @@ void open_it(void)
change_iflag("BRKINT|ICRNL|IXON|IMAXBEL", 0xFFFFFFFF, BRKINT|ICRNL|IXON|IMAXBEL);
change_lflag("ISIG|ICANON|IEXTEN|ECHO|ECHOK|ECHOE|ECHOCTL", 0xFFFFFFFF, ISIG|ICANON|IEXTEN|ECHO|ECHOK|ECHOE|ECHOCTL);
- change_oflag("OPOST|ONLCR|XTABS", 0xFFFFFFFF, OPOST|ONLCR|XTABS);
+ change_oflag("OPOST|ONLCR|OXTABS", 0xFFFFFFFF, OPOST|ONLCR|OXTABS);
}
void close_it(void)
diff --git a/testsuite/termios06/test_main.c b/testsuite/termios06/test_main.c
index dc6e3d6b..9290ef26 100644
--- a/testsuite/termios06/test_main.c
+++ b/testsuite/termios06/test_main.c
@@ -396,7 +396,7 @@ static void test_xtabs(void)
tt_softc.tp->t_column = 0;
tcflush(Test_fd, TCOFLUSH);
- change_oflag("OPOST|XTABS", 0, OPOST|XTABS);
+ change_oflag("OPOST|OXTABS", 0, OPOST|OXTABS);
c = 'a';
n = write(Test_fd, &c, sizeof(c));
@@ -420,7 +420,7 @@ static void test_xtabs(void)
assert(Tx_Buffer[5] == ' ');
assert(Tx_Buffer[6] == ' ');
- change_oflag("~(OPOST|XTABS)", OPOST|XTABS, 0);
+ change_oflag("~(OPOST|OXTABS)", OPOST|OXTABS, 0);
}
static void test_olcuc(void)
diff --git a/testsuite/thread01/test_main.c b/testsuite/thread01/test_main.c
index d3bb5a5c..f1cef304 100644
--- a/testsuite/thread01/test_main.c
+++ b/testsuite/thread01/test_main.c
@@ -38,7 +38,7 @@
#include <assert.h>
#include <sys/types.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <sys/proc.h>
#include <sys/kthread.h>
#include <sys/errno.h>
diff --git a/testsuite/timeout01/timeout_test.c b/testsuite/timeout01/timeout_test.c
index 766f1515..cecbfbe6 100644
--- a/testsuite/timeout01/timeout_test.c
+++ b/testsuite/timeout01/timeout_test.c
@@ -39,7 +39,7 @@
#include <sys/types.h>
#include <sys/systm.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
#include <rtems/bsd/sys/lock.h>
#include <sys/mutex.h>
#include <sys/rwlock.h>
diff --git a/testsuite/unix01/test_main.c b/testsuite/unix01/test_main.c
index fe9dde25..61f9aa4e 100644
--- a/testsuite/unix01/test_main.c
+++ b/testsuite/unix01/test_main.c
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-#include <sys/types.h>
+#include <sys/param.h>
#include <sys/un.h>
#include <sys/stat.h>
#include <sys/socket.h>