From 7cd9d86d6e667edf42941cf9c6363ec90ea81c33 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 2 Nov 2005 13:58:39 +0000 Subject: [PATCH] Removed memcheck/tests/weirdioctl as it is badly broken and seems to serve no useful purpose. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4984 --- memcheck/tests/Makefile.am | 3 +- memcheck/tests/weirdioctl.c | 47 ------------------------- memcheck/tests/weirdioctl.stderr.exp | 5 --- memcheck/tests/weirdioctl.stdout.exp | 52 ---------------------------- memcheck/tests/weirdioctl.vgtest | 3 -- 5 files changed, 1 insertion(+), 109 deletions(-) delete mode 100644 memcheck/tests/weirdioctl.c delete mode 100644 memcheck/tests/weirdioctl.stderr.exp delete mode 100644 memcheck/tests/weirdioctl.stdout.exp delete mode 100644 memcheck/tests/weirdioctl.vgtest diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index 04d3a1b06a..423d96298a 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -84,7 +84,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ suppfree.stderr.exp suppfree.vgtest \ toobig-allocs.stderr.exp toobig-allocs.vgtest \ trivialleak.stderr.exp trivialleak.vgtest \ - weirdioctl.stderr.exp weirdioctl.stdout.exp weirdioctl.vgtest \ metadata.stderr.exp metadata.stdout.exp metadata.vgtest-HIDING \ vgtest_ume.stderr.exp vgtest_ume.disabled \ writev.stderr.exp writev.stderr.exp2 writev.stderr.exp3 writev.vgtest \ @@ -114,7 +113,7 @@ check_PROGRAMS = \ realloc1 realloc2 realloc3 \ sigaltstack signal2 sigprocmask sigkill \ stack_changes strchr str_tester supp_unknown supp1 supp2 suppfree \ - trivialleak weirdioctl \ + trivialleak \ mismatches new_override metadata \ xml1 \ writev zeropage diff --git a/memcheck/tests/weirdioctl.c b/memcheck/tests/weirdioctl.c deleted file mode 100644 index 1548294979..0000000000 --- a/memcheck/tests/weirdioctl.c +++ /dev/null @@ -1,47 +0,0 @@ - -/* A program which sets a readable fd to have a timeout, and therefore - needs --simulation-hints=ioctl-VTIME in order to run without - blocking. - - [Nb: no longer true, since the ioctl-VTIME hack no longer exists] -*/ - -#include -#include -#include - -int main ( void ) -{ - int c, i; - int res; - struct termio tty, oldtty; - - /** - ** Save the old tty settings, and get rid of echo - ** for the new tty settings - **/ - ioctl(0, TCGETA, &oldtty); - tty = oldtty; - tty.c_lflag &= ~(ICANON|ECHO|ECHOE|ECHOK|ECHONL); - tty.c_cc[VMIN] = 0; - tty.c_cc[VTIME] = 5; - res = ioctl(0, TCSETA, &tty); - printf("first ioctl returned %d\n", res); - - /** - ** Now do whatever stuff you want non-echoed - **/ - i = 0; - while (i++ < 50) { - c = getchar(); - printf("got %d\n", c); - } - - /** - ** Now reset the old settings - **/ - res = ioctl(0, TCSETA, &oldtty); - printf("second ioctl returned %d\n", res); - -return 0; -} diff --git a/memcheck/tests/weirdioctl.stderr.exp b/memcheck/tests/weirdioctl.stderr.exp deleted file mode 100644 index cfbe2dab8b..0000000000 --- a/memcheck/tests/weirdioctl.stderr.exp +++ /dev/null @@ -1,5 +0,0 @@ -Syscall param ioctl(TCSET{A,AW,AF}) points to uninitialised byte(s) - at 0x........: ioctl (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) - by 0x........: ... - Address 0x........ is on thread 1's stack diff --git a/memcheck/tests/weirdioctl.stdout.exp b/memcheck/tests/weirdioctl.stdout.exp deleted file mode 100644 index 2b85b94fc0..0000000000 --- a/memcheck/tests/weirdioctl.stdout.exp +++ /dev/null @@ -1,52 +0,0 @@ -first ioctl returned -1 -got 10 -got 47 -got 42 -got 32 -got 65 -got 32 -got 112 -got 114 -got 111 -got 103 -got 114 -got 97 -got 109 -got 32 -got 119 -got 104 -got 105 -got 99 -got 104 -got 32 -got 115 -got 101 -got 116 -got 115 -got 32 -got 97 -got 32 -got 114 -got 101 -got 97 -got 100 -got 97 -got 98 -got 108 -got 101 -got 32 -got 102 -got 100 -got 32 -got 116 -got 111 -got 32 -got 104 -got 97 -got 118 -got 101 -got 32 -got 97 -got 32 -got 116 -second ioctl returned -1 diff --git a/memcheck/tests/weirdioctl.vgtest b/memcheck/tests/weirdioctl.vgtest deleted file mode 100644 index 75bcad48a6..0000000000 --- a/memcheck/tests/weirdioctl.vgtest +++ /dev/null @@ -1,3 +0,0 @@ -prog: weirdioctl -vgopts: -q -args: < weirdioctl.c -- 2.47.3