[compiler-rt] r348707 - Fix conflict types for this FreeBSD test.

[David Carlier via llvm-commits]

Author: devnexen
Date: Sat Dec  8 08:29:50 2018
New Revision: 348707

URL: http://llvm.org/viewvc/llvm-project?rev=348707&view=rev
Log:
Fix conflict types for this FreeBSD test.

Modified:
    compiler-rt/trunk/test/sanitizer_common/TestCases/FreeBSD/capsicum.cc

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/FreeBSD/capsicum.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/FreeBSD/capsicum.cc?rev=348707&r1=348706&r2=348707&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/FreeBSD/capsicum.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/FreeBSD/capsicum.cc Sat Dec  8 08:29:50 2018
@@ -46,51 +46,3 @@ int main(void) {
 	// CHECK: ioctls test: {{.*}} commands authorized
 	// CHECK: rights test: {{.*}}
 }
-// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
-
-#include <sys/capsicum.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <termios.h>
-#include <string.h>
-#include <assert.h>
-
-void test_cap_ioctls() {
-	cap_rights_t rights;
-	unsigned long ncmds[] = {TIOCGETA, TIOCGWINSZ, FIODTYPE};
-	unsigned long rcmds = 0;
-	cap_rights_t *rptr = cap_rights_init(&rights, CAP_IOCTL, CAP_READ);
-	assert(rptr);
-
-	int rv = cap_rights_limit(STDIN_FILENO, &rights);
-	assert(rv == 0);
-	rv = cap_ioctls_limit(STDIN_FILENO, ncmds, 3);
-	assert(rv == 0);
-	ssize_t rz = cap_ioctls_get(STDIN_FILENO, &rcmds, 3);
-	assert(rz == 3);
-	printf("ioctls test: %ld commands authorized\n", rz);
-}
-
-void test_cap_rights() {
-	cap_rights_t rights, grights;
-	cap_rights_t *rptr = cap_rights_init(&rights, CAP_IOCTL, CAP_READ);
-	assert(rptr);
-
-	int rv = cap_rights_limit(STDIN_FILENO, &rights);
-	assert(rv == 0);
-	rv = cap_rights_get(STDIN_FILENO, &grights);
-	assert(rv == 0);
-	assert(memcmp(&grights, &rights, sizeof(grights)) == 0);
-	printf("rights test: %d\n", rv);
-}
-
-int main(void) {
-	test_cap_ioctls();
-	
-	test_cap_rights();
-
-	// CHECK: ioctls test: {{.*}} commands authorized
-	// CHECK: rights test: {{.*}}
-}