Merge remote-tracking branch 'origin/stable/10' into develdevel

1 files changed, 0 insertions, 129 deletions

diff --git a/tests/sys/kqueue/user.c b/tests/sys/kqueue/user.c
deleted file mode 100644
index 9ba25f9..0000000
--- a/tests/sys/kqueue/user.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2009 Mark Heily <mark@heily.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
- */
-
-#include "common.h"
-
-int kqfd;
-
-static void
-add_and_delete(void)
-{
-    const char *test_id = "kevent(EVFILT_USER, EV_ADD and EV_DELETE)";
-    struct kevent kev;
-
-    test_begin(test_id);
-
-    kevent_add(kqfd, &kev, 1, EVFILT_USER, EV_ADD, 0, 0, NULL);
-    test_no_kevents();
-
-    kevent_add(kqfd, &kev, 1, EVFILT_USER, EV_DELETE, 0, 0, NULL);
-    test_no_kevents();
-
-    success();
-}
-
-static void
-event_wait(void)
-{
-    const char *test_id = "kevent(EVFILT_USER, wait)";
-    struct kevent kev;
-
-    test_begin(test_id);
-
-    test_no_kevents();
-
-    /* Add the event, and then trigger it */
-    kevent_add(kqfd, &kev, 1, EVFILT_USER, EV_ADD | EV_CLEAR, 0, 0, NULL);    
-    kevent_add(kqfd, &kev, 1, EVFILT_USER, 0, NOTE_TRIGGER, 0, NULL);    
-
-    kev.fflags &= ~NOTE_FFCTRLMASK;
-    kev.fflags &= ~NOTE_TRIGGER;
-    kev.flags = EV_CLEAR;
-    kevent_cmp(&kev, kevent_get(kqfd));
-
-    test_no_kevents();
-
-    success();
-}
-
-static void
-disable_and_enable(void)
-{
-    const char *test_id = "kevent(EVFILT_USER, EV_DISABLE and EV_ENABLE)";
-    struct kevent kev;
-
-    test_begin(test_id);
-
-    test_no_kevents();
-
-    kevent_add(kqfd, &kev, 1, EVFILT_USER, EV_ADD, 0, 0, NULL); 
-    kevent_add(kqfd, &kev, 1, EVFILT_USER, EV_DISABLE, 0, 0, NULL); 
-
-    /* Trigger the event, but since it is disabled, nothing will happen. */
-    kevent_add(kqfd, &kev, 1, EVFILT_USER, 0, NOTE_TRIGGER, 0, NULL); 
-    test_no_kevents();
-
-    kevent_add(kqfd, &kev, 1, EVFILT_USER, EV_ENABLE, 0, 0, NULL); 
-    kevent_add(kqfd, &kev, 1, EVFILT_USER, 0, NOTE_TRIGGER, 0, NULL); 
-
-    kev.flags = EV_CLEAR;
-    kev.fflags &= ~NOTE_FFCTRLMASK;
-    kev.fflags &= ~NOTE_TRIGGER;
-    kevent_cmp(&kev, kevent_get(kqfd));
-
-    success();
-}
-
-static void
-oneshot(void)
-{
-    const char *test_id = "kevent(EVFILT_USER, EV_ONESHOT)";
-    struct kevent kev;
-
-    test_begin(test_id);
-
-    test_no_kevents();
-
-    kevent_add(kqfd, &kev, 2, EVFILT_USER, EV_ADD | EV_ONESHOT, 0, 0, NULL);
-
-    puts("  -- event 1");
-    kevent_add(kqfd, &kev, 2, EVFILT_USER, 0, NOTE_TRIGGER, 0, NULL);    
-
-    kev.flags = EV_ONESHOT;
-    kev.fflags &= ~NOTE_FFCTRLMASK;
-    kev.fflags &= ~NOTE_TRIGGER;
-    kevent_cmp(&kev, kevent_get(kqfd));
-
-    test_no_kevents();
-
-    success();
-}
-
-void
-test_evfilt_user()
-{
-	kqfd = kqueue();
-
-    add_and_delete();
-    event_wait();
-    disable_and_enable();
-    oneshot();
-    /* TODO: try different fflags operations */
-
-	close(kqfd);
-}