move external configure test programs

from tests/*.c to build/tests/*.c

metze
(This used to be commit dea3a3acbfe2341f9276ceaec2a42f0931e2c336)

15 files changed, 12 insertions, 1510 deletions

diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index f50b719b33..a75568b599 100644
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@@ -850,11 +850,11 @@ AC_CACHE_CHECK([whether building shared libraries actually works],
    ac_cv_shlib_works=no
    # try building a trivial shared library
    if test "$PICSUFFIX" = "po"; then
-     $CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.po ${srcdir-.}/tests/shlib.c &&
+     $CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.po ${srcdir-.}/build/tests/shlib.c &&
        $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o shlib.so shlib.po &&
        ac_cv_shlib_works=yes
    else
-     $CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.$PICSUFFIX ${srcdir-.}/tests/shlib.c &&
+     $CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.$PICSUFFIX ${srcdir-.}/build/tests/shlib.c &&
        mv shlib.$PICSUFFIX shlib.po &&
        $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o shlib.so shlib.po &&
        ac_cv_shlib_works=yes
@@ -1239,20 +1239,20 @@ if test x"$samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT" = x"yes"; then
 fi
 
 AC_MSG_CHECKING([for test routines])
-AC_TRY_RUN([#include "${srcdir-.}/tests/trivial.c"],
+AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"],
            AC_MSG_RESULT(yes),
 	   AC_MSG_ERROR([cant find test code. Aborting config]),
 	   AC_MSG_WARN([cannot run when cross-compiling]))
 
 AC_CACHE_CHECK([for ftruncate extend],samba_cv_HAVE_FTRUNCATE_EXTEND,[
-AC_TRY_RUN([#include "${srcdir-.}/tests/ftruncate.c"],
+AC_TRY_RUN([#include "${srcdir-.}/build/tests/ftruncate.c"],
            samba_cv_HAVE_FTRUNCATE_EXTEND=yes,samba_cv_HAVE_FTRUNCATE_EXTEND=no,samba_cv_HAVE_FTRUNCATE_EXTEND=cross)])
 if test x"$samba_cv_HAVE_FTRUNCATE_EXTEND" = x"yes"; then
     AC_DEFINE(HAVE_FTRUNCATE_EXTEND,1,[Truncate extend])
 fi
 
 AC_CACHE_CHECK([for AF_LOCAL socket support], samba_cv_HAVE_WORKING_AF_LOCAL, [
-AC_TRY_RUN([#include "${srcdir-.}/tests/unixsock.c"],
+AC_TRY_RUN([#include "${srcdir-.}/build/tests/unixsock.c"],
 	   samba_cv_HAVE_WORKING_AF_LOCAL=yes,
 	   samba_cv_HAVE_WORKING_AF_LOCAL=no,
 	   samba_cv_HAVE_WORKING_AF_LOCAL=cross)])
@@ -1262,7 +1262,7 @@ then
 fi
 
 AC_CACHE_CHECK([for broken getgroups],samba_cv_HAVE_BROKEN_GETGROUPS,[
-AC_TRY_RUN([#include "${srcdir-.}/tests/getgroups.c"],
+AC_TRY_RUN([#include "${srcdir-.}/build/tests/getgroups.c"],
            samba_cv_HAVE_BROKEN_GETGROUPS=yes,samba_cv_HAVE_BROKEN_GETGROUPS=no,samba_cv_HAVE_BROKEN_GETGROUPS=cross)])
 if test x"$samba_cv_HAVE_BROKEN_GETGROUPS" = x"yes"; then
     AC_DEFINE(HAVE_BROKEN_GETGROUPS,1,[Whether getgroups is broken])
@@ -1439,28 +1439,28 @@ fi
 
 
 AC_CACHE_CHECK([for working mmap],samba_cv_HAVE_MMAP,[
-AC_TRY_RUN([#include "${srcdir-.}/tests/shared_mmap.c"],
+AC_TRY_RUN([#include "${srcdir-.}/build/tests/shared_mmap.c"],
            samba_cv_HAVE_MMAP=yes,samba_cv_HAVE_MMAP=no,samba_cv_HAVE_MMAP=cross)])
 if test x"$samba_cv_HAVE_MMAP" = x"yes"; then
     AC_DEFINE(HAVE_MMAP,1,[Whether mmap works])
 fi
 
 AC_CACHE_CHECK([for ftruncate needs root],samba_cv_FTRUNCATE_NEEDS_ROOT,[
-AC_TRY_RUN([#include "${srcdir-.}/tests/ftruncroot.c"],
+AC_TRY_RUN([#include "${srcdir-.}/build/tests/ftruncroot.c"],
            samba_cv_FTRUNCATE_NEEDS_ROOT=yes,samba_cv_FTRUNCATE_NEEDS_ROOT=no,samba_cv_FTRUNCATE_NEEDS_ROOT=cross)])
 if test x"$samba_cv_FTRUNCATE_NEEDS_ROOT" = x"yes"; then
     AC_DEFINE(FTRUNCATE_NEEDS_ROOT,1,[Whether ftruncate() needs root])
 fi
 
 AC_CACHE_CHECK([for fcntl locking],samba_cv_HAVE_FCNTL_LOCK,[
-AC_TRY_RUN([#include "${srcdir-.}/tests/fcntl_lock.c"],
+AC_TRY_RUN([#include "${srcdir-.}/build/tests/fcntl_lock.c"],
            samba_cv_HAVE_FCNTL_LOCK=yes,samba_cv_HAVE_FCNTL_LOCK=no,samba_cv_HAVE_FCNTL_LOCK=cross)])
 if test x"$samba_cv_HAVE_FCNTL_LOCK" = x"yes"; then
     AC_DEFINE(HAVE_FCNTL_LOCK,1,[Whether fcntl locking is available])
 fi
 
 AC_CACHE_CHECK([for broken (glibc2.1/x86) 64 bit fcntl locking],samba_cv_HAVE_BROKEN_FCNTL64_LOCKS,[
-AC_TRY_RUN([#include "${srcdir-.}/tests/fcntl_lock64.c"],
+AC_TRY_RUN([#include "${srcdir-.}/build/tests/fcntl_lock64.c"],
            samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=yes,samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no,samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=cross)])
 if test x"$samba_cv_HAVE_BROKEN_FCNTL64_LOCKS" = x"yes"; then
     AC_DEFINE(HAVE_BROKEN_FCNTL64_LOCKS,1,[Whether fcntl64 locks are broken])
@@ -1571,7 +1571,7 @@ if test x"$with_pam_for_crypt" != x"yes"; then
 AC_CACHE_CHECK([for a crypt that needs truncated salt],samba_cv_HAVE_TRUNCATED_SALT,[
 crypt_LIBS="$LIBS"
 LIBS="$AUTHLIBS $LIBS"
-AC_TRY_RUN([#include "${srcdir-.}/tests/crypttest.c"],
+AC_TRY_RUN([#include "${srcdir-.}/build/tests/crypttest.c"],
 	samba_cv_HAVE_TRUNCATED_SALT=no,samba_cv_HAVE_TRUNCATED_SALT=yes,samba_cv_HAVE_TRUNCATED_SALT=cross)
 LIBS="$crypt_LIBS"])
 if test x"$samba_cv_HAVE_TRUNCATED_SALT" = x"yes"; then
diff --git a/source4/configure.in b/source4/configure.in
index d21918486d..1e88601d43 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -222,7 +222,7 @@ fi
 # final configure stuff
 
 AC_MSG_CHECKING([configure summary])
-AC_TRY_RUN([#include "${srcdir-.}/tests/summary.c"],
+AC_TRY_RUN([#include "${srcdir-.}/build/tests/summary.c"],
            AC_MSG_RESULT(yes),
 	   AC_MSG_ERROR([summary failure. Aborting config]); exit 1;,
 	   AC_MSG_WARN([cannot run when cross-compiling]))
diff --git a/source4/tests/.cvsignore b/source4/tests/.cvsignore
deleted file mode 100644
index ff5b9ca58d..0000000000
--- a/source4/tests/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-unixsock
-fcntl_lock_thread
-a.out
diff --git a/source4/tests/README b/source4/tests/README
deleted file mode 100644
index cf1be8b00a..0000000000
--- a/source4/tests/README
+++ /dev/null
@@ -1,10 +0,0 @@
-This directory contains autoconf test programs that are too large to
-comfortably fit in configure.in.
-
-These programs should test one feature of the OS and exit(0) if it
-works or exit(1) if it doesn't work (do _not_ use return)
-
-The programs should be kept simple and to the point. Beautiful/fast
-code is not necessary
-
-
diff --git a/source4/tests/crypttest.c b/source4/tests/crypttest.c
deleted file mode 100644
index efee2e593d..0000000000
--- a/source4/tests/crypttest.c
+++ /dev/null
@@ -1,852 +0,0 @@
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-
-#include <sys/types.h>
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
-#if !defined(HAVE_CRYPT)
-
-/*
-   This bit of code was derived from the UFC-crypt package which
-   carries the following copyright
-
-   Modified for use by Samba by Andrew Tridgell, October 1994
-
-   Note that this routine is only faster on some machines. Under Linux 1.1.51 
-   libc 4.5.26 I actually found this routine to be slightly slower.
-
-   Under SunOS I found a huge speedup by using these routines 
-   (a factor of 20 or so)
-
-   Warning: I've had a report from Steve Kennedy <steve@gbnet.org>
-   that this crypt routine may sometimes get the wrong answer. Only
-   use UFC_CRYT if you really need it.
-
-*/
-
-/*
- * UFC-crypt: ultra fast crypt(3) implementation
- *
- * Copyright (C) 1991-1998, Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * @(#)crypt_util.c	2.31 02/08/92
- *
- * Support routines
- *
- */
-
-
-#ifndef long32
-#if (SIZEOF_INT == 4)
-#define long32 int
-#elif (SIZEOF_LONG == 4)
-#define long32 long
-#elif (SIZEOF_SHORT == 4)
-#define long32 short
-#else
-/* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */
-#define long32 int
-#endif
-#endif
-
-#ifndef long64
-#ifdef HAVE_LONGLONG
-#define long64 long long long
-#endif
-#endif
-
-#ifndef ufc_long
-#define ufc_long unsigned
-#endif
-
-#ifndef _UFC_64_
-#define _UFC_32_
-#endif
-
-/* 
- * Permutation done once on the 56 bit 
- *  key derived from the original 8 byte ASCII key.
- */
-static int pc1[56] = { 
-  57, 49, 41, 33, 25, 17,  9,  1, 58, 50, 42, 34, 26, 18,
-  10,  2, 59, 51, 43, 35, 27, 19, 11,  3, 60, 52, 44, 36,
-  63, 55, 47, 39, 31, 23, 15,  7, 62, 54, 46, 38, 30, 22,
-  14,  6, 61, 53, 45, 37, 29, 21, 13,  5, 28, 20, 12,  4
-};
-
-/*
- * How much to rotate each 28 bit half of the pc1 permutated
- *  56 bit key before using pc2 to give the i' key
- */
-static int rots[16] = { 
-  1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1 
-};
-
-/* 
- * Permutation giving the key 
- * of the i' DES round 
- */
-static int pc2[48] = { 
-  14, 17, 11, 24,  1,  5,  3, 28, 15,  6, 21, 10,
-  23, 19, 12,  4, 26,  8, 16,  7, 27, 20, 13,  2,
-  41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48,
-  44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32
-};
-
-/*
- * The E expansion table which selects
- * bits from the 32 bit intermediate result.
- */
-static int esel[48] = { 
-  32,  1,  2,  3,  4,  5,  4,  5,  6,  7,  8,  9,
-   8,  9, 10, 11, 12, 13, 12, 13, 14, 15, 16, 17,
-  16, 17, 18, 19, 20, 21, 20, 21, 22, 23, 24, 25,
-  24, 25, 26, 27, 28, 29, 28, 29, 30, 31, 32,  1
-};
-static int e_inverse[64];
-
-/* 
- * Permutation done on the 
- * result of sbox lookups 
- */
-static int perm32[32] = {
-  16,  7, 20, 21, 29, 12, 28, 17,  1, 15, 23, 26,  5, 18, 31, 10,
-  2,   8, 24, 14, 32, 27,  3,  9, 19, 13, 30,  6, 22, 11,  4, 25
-};
-
-/* 
- * The sboxes
- */
-static int sbox[8][4][16]= {
-        { { 14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7 },
-          {  0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8 },
-          {  4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0 },
-          { 15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13 }
-        },
-
-        { { 15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10 },
-          {  3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5 },
-          {  0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15 },
-          { 13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9 }
-        },
-
-        { { 10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8 },
-          { 13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1 },
-          { 13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7 },
-          {  1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12 }
-        },
-
-        { {  7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15 },
-          { 13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9 },
-          { 10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4 },
-          {  3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14 }
-        },
-
-        { {  2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9 },
-          { 14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6 },
-          {  4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14 },
-          { 11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3 }
-        },
-
-        { { 12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11 },
-          { 10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8 },
-          {  9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6 },
-          {  4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13 }
-        },
-
-        { {  4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1 },
-          { 13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6 },
-          {  1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2 },
-          {  6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12 }
-        },
-
-        { { 13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7 },
-          {  1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2 },
-          {  7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8 },
-          {  2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11 }
-        }
-};
-
-/* 
- * This is the final 
- * permutation matrix
- */
-static int final_perm[64] = {
-  40,  8, 48, 16, 56, 24, 64, 32, 39,  7, 47, 15, 55, 23, 63, 31,
-  38,  6, 46, 14, 54, 22, 62, 30, 37,  5, 45, 13, 53, 21, 61, 29,
-  36,  4, 44, 12, 52, 20, 60, 28, 35,  3, 43, 11, 51, 19, 59, 27,
-  34,  2, 42, 10, 50, 18, 58, 26, 33,  1, 41,  9, 49, 17, 57, 25
-};
-
-/* 
- * The 16 DES keys in BITMASK format 
- */
-#ifdef _UFC_32_
-long32 _ufc_keytab[16][2];
-#endif
-
-#ifdef _UFC_64_
-long64 _ufc_keytab[16];
-#endif
-
-
-#define ascii_to_bin(c) ((c)>='a'?(c-59):(c)>='A'?((c)-53):(c)-'.')
-#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.')
-
-/* Macro to set a bit (0..23) */
-#define BITMASK(i) ( (1<<(11-(i)%12+3)) << ((i)<12?16:0) )
-
-/*
- * sb arrays:
- *
- * Workhorses of the inner loop of the DES implementation.
- * They do sbox lookup, shifting of this  value, 32 bit
- * permutation and E permutation for the next round.
- *
- * Kept in 'BITMASK' format.
- */
-
-#ifdef _UFC_32_
-long32 _ufc_sb0[8192], _ufc_sb1[8192], _ufc_sb2[8192], _ufc_sb3[8192];
-static long32 *sb[4] = {_ufc_sb0, _ufc_sb1, _ufc_sb2, _ufc_sb3}; 
-#endif
-
-#ifdef _UFC_64_
-long64 _ufc_sb0[4096], _ufc_sb1[4096], _ufc_sb2[4096], _ufc_sb3[4096];
-static long64 *sb[4] = {_ufc_sb0, _ufc_sb1, _ufc_sb2, _ufc_sb3}; 
-#endif
-
-/* 
- * eperm32tab: do 32 bit permutation and E selection
- *
- * The first index is the byte number in the 32 bit value to be permuted
- *  -  second  -   is the value of this byte
- *  -  third   -   selects the two 32 bit values
- *
- * The table is used and generated internally in init_des to speed it up
- */
-static ufc_long eperm32tab[4][256][2];
-
-/* 
- * do_pc1: permform pc1 permutation in the key schedule generation.
- *
- * The first   index is the byte number in the 8 byte ASCII key
- *  -  second    -      -    the two 28 bits halfs of the result
- *  -  third     -   selects the 7 bits actually used of each byte
- *
- * The result is kept with 28 bit per 32 bit with the 4 most significant
- * bits zero.
- */
-static ufc_long do_pc1[8][2][128];
-
-/*
- * do_pc2: permform pc2 permutation in the key schedule generation.
- *
- * The first   index is the septet number in the two 28 bit intermediate values
- *  -  second    -    -  -  septet values
- *
- * Knowledge of the structure of the pc2 permutation is used.
- *
- * The result is kept with 28 bit per 32 bit with the 4 most significant
- * bits zero.
- */
-static ufc_long do_pc2[8][128];
-
-/*
- * efp: undo an extra e selection and do final
- *      permutation giving the DES result.
- * 
- *      Invoked 6 bit a time on two 48 bit values
- *      giving two 32 bit longs.
- */
-static ufc_long efp[16][64][2];
-
-static unsigned char bytemask[8]  = {
-  0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01
-};
-
-static ufc_long longmask[32] = {
-  0x80000000, 0x40000000, 0x20000000, 0x10000000,
-  0x08000000, 0x04000000, 0x02000000, 0x01000000,
-  0x00800000, 0x00400000, 0x00200000, 0x00100000,
-  0x00080000, 0x00040000, 0x00020000, 0x00010000,
-  0x00008000, 0x00004000, 0x00002000, 0x00001000,
-  0x00000800, 0x00000400, 0x00000200, 0x00000100,
-  0x00000080, 0x00000040, 0x00000020, 0x00000010,
-  0x00000008, 0x00000004, 0x00000002, 0x00000001
-};
-
-
-/*
- * Silly rewrite of 'bzero'. I do so
- * because some machines don't have
- * bzero and some don't have memset.
- */
-
-static void clearmem(char *start, int cnt)
-  { while(cnt--)
-      *start++ = '\0';
-  }
-
-static int initialized = 0;
-
-/* lookup a 6 bit value in sbox */
-
-#define s_lookup(i,s) sbox[(i)][(((s)>>4) & 0x2)|((s) & 0x1)][((s)>>1) & 0xf];
-
-/*
- * Initialize unit - may be invoked directly
- * by fcrypt users.
- */
-
-static void ufc_init_des(void)
-  { int comes_from_bit;
-    int bit, sg;
-    ufc_long j;
-    ufc_long mask1, mask2;
-
-    /*
-     * Create the do_pc1 table used
-     * to affect pc1 permutation
-     * when generating keys
-     */
-    for(bit = 0; bit < 56; bit++) {
-      comes_from_bit  = pc1[bit] - 1;
-      mask1 = bytemask[comes_from_bit % 8 + 1];
-      mask2 = longmask[bit % 28 + 4];
-      for(j = 0; j < 128; j++) {
-	if(j & mask1) 
-	  do_pc1[comes_from_bit / 8][bit / 28][j] |= mask2;
-      }
-    }
-
-    /*
-     * Create the do_pc2 table used
-     * to affect pc2 permutation when
-     * generating keys
-     */
-    for(bit = 0; bit < 48; bit++) {
-      comes_from_bit  = pc2[bit] - 1;
-      mask1 = bytemask[comes_from_bit % 7 + 1];
-      mask2 = BITMASK(bit % 24);
-      for(j = 0; j < 128; j++) {
-	if(j & mask1)
-	  do_pc2[comes_from_bit / 7][j] |= mask2;
-      }
-    }
-
-    /* 
-     * Now generate the table used to do combined
-     * 32 bit permutation and e expansion
-     *
-     * We use it because we have to permute 16384 32 bit
-     * longs into 48 bit in order to initialize sb.
-     *
-     * Looping 48 rounds per permutation becomes 
-     * just too slow...
-     *
-     */
-
-    clearmem((char*)eperm32tab, sizeof(eperm32tab));
-
-    for(bit = 0; bit < 48; bit++) {
-      ufc_long inner_mask1,comes_from;
-	
-      comes_from = perm32[esel[bit]-1]-1;
-      inner_mask1      = bytemask[comes_from % 8];
-	
-      for(j = 256; j--;) {
-	if(j & inner_mask1)
-	  eperm32tab[comes_from / 8][j][bit / 24] |= BITMASK(bit % 24);
-      }
-    }
-    
-    /* 
-     * Create the sb tables:
-     *
-     * For each 12 bit segment of an 48 bit intermediate
-     * result, the sb table precomputes the two 4 bit
-     * values of the sbox lookups done with the two 6
-     * bit halves, shifts them to their proper place,
-     * sends them through perm32 and finally E expands
-     * them so that they are ready for the next
-     * DES round.
-     *
-     */
-    for(sg = 0; sg < 4; sg++) {
-      int j1, j2;
-      int s1, s2;
-    
-      for(j1 = 0; j1 < 64; j1++) {
-	s1 = s_lookup(2 * sg, j1);
-	for(j2 = 0; j2 < 64; j2++) {
-	  ufc_long to_permute, inx;
-    
-	  s2         = s_lookup(2 * sg + 1, j2);
-	  to_permute = ((s1 << 4)  | s2) << (24 - 8 * sg);
-
-#ifdef _UFC_32_
-	  inx = ((j1 << 6)  | j2) << 1;
-	  sb[sg][inx  ]  = eperm32tab[0][(to_permute >> 24) & 0xff][0];
-	  sb[sg][inx+1]  = eperm32tab[0][(to_permute >> 24) & 0xff][1];
-	  sb[sg][inx  ] |= eperm32tab[1][(to_permute >> 16) & 0xff][0];
-	  sb[sg][inx+1] |= eperm32tab[1][(to_permute >> 16) & 0xff][1];
-  	  sb[sg][inx  ] |= eperm32tab[2][(to_permute >>  8) & 0xff][0];
-	  sb[sg][inx+1] |= eperm32tab[2][(to_permute >>  8) & 0xff][1];
-	  sb[sg][inx  ] |= eperm32tab[3][(to_permute)       & 0xff][0];
-	  sb[sg][inx+1] |= eperm32tab[3][(to_permute)       & 0xff][1];
-#endif
-#ifdef _UFC_64_
-	  inx = ((j1 << 6)  | j2);
-	  sb[sg][inx]  = 
-	    ((long64)eperm32tab[0][(to_permute >> 24) & 0xff][0] << 32) |
-	     (long64)eperm32tab[0][(to_permute >> 24) & 0xff][1];
-	  sb[sg][inx] |=
-	    ((long64)eperm32tab[1][(to_permute >> 16) & 0xff][0] << 32) |
-	     (long64)eperm32tab[1][(to_permute >> 16) & 0xff][1];
-  	  sb[sg][inx] |= 
-	    ((long64)eperm32tab[2][(to_permute >>  8) & 0xff][0] << 32) |
-	     (long64)eperm32tab[2][(to_permute >>  8) & 0xff][1];
-	  sb[sg][inx] |=
-	    ((long64)eperm32tab[3][(to_permute)       & 0xff][0] << 32) |
-	     (long64)eperm32tab[3][(to_permute)       & 0xff][1];
-#endif
-	}
-      }
-    }  
-
-    /* 
-     * Create an inverse matrix for esel telling
-     * where to plug out bits if undoing it
-     */
-    for(bit=48; bit--;) {
-      e_inverse[esel[bit] - 1     ] = bit;
-      e_inverse[esel[bit] - 1 + 32] = bit + 48;
-    }
-
-    /* 
-     * create efp: the matrix used to
-     * undo the E expansion and effect final permutation
-     */
-    clearmem((char*)efp, sizeof efp);
-    for(bit = 0; bit < 64; bit++) {
-      int o_bit, o_long;
-      ufc_long word_value, inner_mask1, inner_mask2;
-      int comes_from_f_bit, comes_from_e_bit;
-      int comes_from_word, bit_within_word;
-
-      /* See where bit i belongs in the two 32 bit long's */
-      o_long = bit / 32; /* 0..1  */
-      o_bit  = bit % 32; /* 0..31 */
-
-      /* 
-       * And find a bit in the e permutated value setting this bit.
-       *
-       * Note: the e selection may have selected the same bit several
-       * times. By the initialization of e_inverse, we only look
-       * for one specific instance.
-       */
-      comes_from_f_bit = final_perm[bit] - 1;         /* 0..63 */
-      comes_from_e_bit = e_inverse[comes_from_f_bit]; /* 0..95 */
-      comes_from_word  = comes_from_e_bit / 6;        /* 0..15 */
-      bit_within_word  = comes_from_e_bit % 6;        /* 0..5  */
-
-      inner_mask1 = longmask[bit_within_word + 26];
-      inner_mask2 = longmask[o_bit];
-
-      for(word_value = 64; word_value--;) {
-	if(word_value & inner_mask1)
-	  efp[comes_from_word][word_value][o_long] |= inner_mask2;
-      }
-    }
-    initialized++;
-  }
-
-/* 
- * Process the elements of the sb table permuting the
- * bits swapped in the expansion by the current salt.
- */
-
-#ifdef _UFC_32_
-static void shuffle_sb(long32 *k, ufc_long saltbits)
-  { ufc_long j;
-    long32 x;
-    for(j=4096; j--;) {
-      x = (k[0] ^ k[1]) & (long32)saltbits;
-      *k++ ^= x;
-      *k++ ^= x;
-    }
-  }
-#endif
-
-#ifdef _UFC_64_
-static void shuffle_sb(long64 *k, ufc_long saltbits)
-  { ufc_long j;
-    long64 x;
-    for(j=4096; j--;) {
-      x = ((*k >> 32) ^ *k) & (long64)saltbits;
-      *k++ ^= (x << 32) | x;
-    }
-  }
-#endif
-
-/* 
- * Setup the unit for a new salt
- * Hopefully we'll not see a new salt in each crypt call.
- */
-
-static unsigned char current_salt[3] = "&&"; /* invalid value */
-static ufc_long current_saltbits = 0;
-static int direction = 0;
-
-static void setup_salt(const char *s1)
-  { ufc_long i, j, saltbits;
-    const unsigned char *s2 = (const unsigned char *)s1;
-
-    if(!initialized)
-      ufc_init_des();
-
-    if(s2[0] == current_salt[0] && s2[1] == current_salt[1])
-      return;
-    current_salt[0] = s2[0]; current_salt[1] = s2[1];
-
-    /* 
-     * This is the only crypt change to DES:
-     * entries are swapped in the expansion table
-     * according to the bits set in the salt.
-     */
-    saltbits = 0;
-    for(i = 0; i < 2; i++) {
-      long c=ascii_to_bin(s2[i]);
-      if(c < 0 || c > 63)
-	c = 0;
-      for(j = 0; j < 6; j++) {
-	if((c >> j) & 0x1)
-	  saltbits |= BITMASK(6 * i + j);
-      }
-    }
-
-    /*
-     * Permute the sb table values
-     * to reflect the changed e
-     * selection table
-     */
-    shuffle_sb(_ufc_sb0, current_saltbits ^ saltbits); 
-    shuffle_sb(_ufc_sb1, current_saltbits ^ saltbits);
-    shuffle_sb(_ufc_sb2, current_saltbits ^ saltbits);
-    shuffle_sb(_ufc_sb3, current_saltbits ^ saltbits);
-
-    current_saltbits = saltbits;
-  }
-
-static void ufc_mk_keytab(char *key)
-  { ufc_long v1, v2, *k1;
-    int i;
-#ifdef _UFC_32_
-    long32 v, *k2 = &_ufc_keytab[0][0];
-#endif
-#ifdef _UFC_64_
-    long64 v, *k2 = &_ufc_keytab[0];
-#endif
-
-    v1 = v2 = 0; k1 = &do_pc1[0][0][0];
-    for(i = 8; i--;) {
-      v1 |= k1[*key   & 0x7f]; k1 += 128;
-      v2 |= k1[*key++ & 0x7f]; k1 += 128;
-    }
-
-    for(i = 0; i < 16; i++) {
-      k1 = &do_pc2[0][0];
-
-      v1 = (v1 << rots[i]) | (v1 >> (28 - rots[i]));
-      v  = k1[(v1 >> 21) & 0x7f]; k1 += 128;
-      v |= k1[(v1 >> 14) & 0x7f]; k1 += 128;
-      v |= k1[(v1 >>  7) & 0x7f]; k1 += 128;
-      v |= k1[(v1      ) & 0x7f]; k1 += 128;
-
-#ifdef _UFC_32_
-      *k2++ = v;
-      v = 0;
-#endif
-#ifdef _UFC_64_
-      v <<= 32;
-#endif
-
-      v2 = (v2 << rots[i]) | (v2 >> (28 - rots[i]));
-      v |= k1[(v2 >> 21) & 0x7f]; k1 += 128;
-      v |= k1[(v2 >> 14) & 0x7f]; k1 += 128;
-      v |= k1[(v2 >>  7) & 0x7f]; k1 += 128;
-      v |= k1[(v2      ) & 0x7f];
-
-      *k2++ = v;
-    }
-
-    direction = 0;
-  }
-
-/* 
- * Undo an extra E selection and do final permutations
- */
-
-ufc_long *_ufc_dofinalperm(ufc_long l1, ufc_long l2, ufc_long r1, ufc_long r2)
-  { ufc_long v1, v2, x;
-    static ufc_long ary[2];
-
-    x = (l1 ^ l2) & current_saltbits; l1 ^= x; l2 ^= x;
-    x = (r1 ^ r2) & current_saltbits; r1 ^= x; r2 ^= x;
-
-    v1=v2=0; l1 >>= 3; l2 >>= 3; r1 >>= 3; r2 >>= 3;
-
-    v1 |= efp[15][ r2         & 0x3f][0]; v2 |= efp[15][ r2 & 0x3f][1];
-    v1 |= efp[14][(r2 >>= 6)  & 0x3f][0]; v2 |= efp[14][ r2 & 0x3f][1];
-    v1 |= efp[13][(r2 >>= 10) & 0x3f][0]; v2 |= efp[13][ r2 & 0x3f][1];
-    v1 |= efp[12][(r2 >>= 6)  & 0x3f][0]; v2 |= efp[12][ r2 & 0x3f][1];
-
-    v1 |= efp[11][ r1         & 0x3f][0]; v2 |= efp[11][ r1 & 0x3f][1];
-    v1 |= efp[10][(r1 >>= 6)  & 0x3f][0]; v2 |= efp[10][ r1 & 0x3f][1];
-    v1 |= efp[ 9][(r1 >>= 10) & 0x3f][0]; v2 |= efp[ 9][ r1 & 0x3f][1];
-    v1 |= efp[ 8][(r1 >>= 6)  & 0x3f][0]; v2 |= efp[ 8][ r1 & 0x3f][1];
-
-    v1 |= efp[ 7][ l2         & 0x3f][0]; v2 |= efp[ 7][ l2 & 0x3f][1];
-    v1 |= efp[ 6][(l2 >>= 6)  & 0x3f][0]; v2 |= efp[ 6][ l2 & 0x3f][1];
-    v1 |= efp[ 5][(l2 >>= 10) & 0x3f][0]; v2 |= efp[ 5][ l2 & 0x3f][1];
-    v1 |= efp[ 4][(l2 >>= 6)  & 0x3f][0]; v2 |= efp[ 4][ l2 & 0x3f][1];
-
-    v1 |= efp[ 3][ l1         & 0x3f][0]; v2 |= efp[ 3][ l1 & 0x3f][1];
-    v1 |= efp[ 2][(l1 >>= 6)  & 0x3f][0]; v2 |= efp[ 2][ l1 & 0x3f][1];
-    v1 |= efp[ 1][(l1 >>= 10) & 0x3f][0]; v2 |= efp[ 1][ l1 & 0x3f][1];
-    v1 |= efp[ 0][(l1 >>= 6)  & 0x3f][0]; v2 |= efp[ 0][ l1 & 0x3f][1];
-
-    ary[0] = v1; ary[1] = v2;
-    return ary;
-  }
-
-/* 
- * crypt only: convert from 64 bit to 11 bit ASCII 
- * prefixing with the salt
- */
-
-static char *output_conversion(ufc_long v1, ufc_long v2, const char *salt)
-  { static char outbuf[14];
-    int i, s;
-
-    outbuf[0] = salt[0];
-    outbuf[1] = salt[1] ? salt[1] : salt[0];
-
-    for(i = 0; i < 5; i++)
-      outbuf[i + 2] = bin_to_ascii((v1 >> (26 - 6 * i)) & 0x3f);
-
-    s  = (v2 & 0xf) << 2;
-    v2 = (v2 >> 2) | ((v1 & 0x3) << 30);
-
-    for(i = 5; i < 10; i++)
-      outbuf[i + 2] = bin_to_ascii((v2 >> (56 - 6 * i)) & 0x3f);
-
-    outbuf[12] = bin_to_ascii(s);
-    outbuf[13] = 0;
-
-    return outbuf;
-  }
-
-/* 
- * UNIX crypt function
- */
-
-static ufc_long *_ufc_doit(ufc_long , ufc_long, ufc_long, ufc_long, ufc_long);
-   
-char *ufc_crypt(const char *key,const char *salt)
-  { ufc_long *s;
-    char ktab[9];
-
-    /*
-     * Hack DES tables according to salt
-     */
-    setup_salt(salt);
-
-    /*
-     * Setup key schedule
-     */
-    clearmem(ktab, sizeof ktab);
-    strncpy(ktab, key, 8);
-    ufc_mk_keytab(ktab);
-
-    /*
-     * Go for the 25 DES encryptions
-     */
-    s = _ufc_doit((ufc_long)0, (ufc_long)0, 
-		  (ufc_long)0, (ufc_long)0, (ufc_long)25);
-
-    /*
-     * And convert back to 6 bit ASCII
-     */
-    return output_conversion(s[0], s[1], salt);
-  }
-
-
-#ifdef _UFC_32_
-
-/*
- * 32 bit version
- */
-
-extern long32 _ufc_keytab[16][2];
-extern long32 _ufc_sb0[], _ufc_sb1[], _ufc_sb2[], _ufc_sb3[];
-
-#define SBA(sb, v) (*(long32*)((char*)(sb)+(v)))
-
-static ufc_long *_ufc_doit(ufc_long l1, ufc_long l2, ufc_long r1, ufc_long r2, ufc_long itr)
-  { int i;
-    long32 s, *k;
-
-    while(itr--) {
-      k = &_ufc_keytab[0][0];
-      for(i=8; i--; ) {
-	s = *k++ ^ r1;
-	l1 ^= SBA(_ufc_sb1, s & 0xffff); l2 ^= SBA(_ufc_sb1, (s & 0xffff)+4);  
-        l1 ^= SBA(_ufc_sb0, s >>= 16);   l2 ^= SBA(_ufc_sb0, (s)         +4); 
-        s = *k++ ^ r2; 
-        l1 ^= SBA(_ufc_sb3, s & 0xffff); l2 ^= SBA(_ufc_sb3, (s & 0xffff)+4);
-        l1 ^= SBA(_ufc_sb2, s >>= 16);   l2 ^= SBA(_ufc_sb2, (s)         +4);
-
-        s = *k++ ^ l1; 
-        r1 ^= SBA(_ufc_sb1, s & 0xffff); r2 ^= SBA(_ufc_sb1, (s & 0xffff)+4);  
-        r1 ^= SBA(_ufc_sb0, s >>= 16);   r2 ^= SBA(_ufc_sb0, (s)         +4); 
-        s = *k++ ^ l2; 
-        r1 ^= SBA(_ufc_sb3, s & 0xffff); r2 ^= SBA(_ufc_sb3, (s & 0xffff)+4);  
-        r1 ^= SBA(_ufc_sb2, s >>= 16);   r2 ^= SBA(_ufc_sb2, (s)         +4);
-      } 
-      s=l1; l1=r1; r1=s; s=l2; l2=r2; r2=s;
-    }
-    return _ufc_dofinalperm(l1, l2, r1, r2);
-  }
-
-#endif
-
-#ifdef _UFC_64_
-
-/*
- * 64 bit version
- */
-
-extern long64 _ufc_keytab[16];
-extern long64 _ufc_sb0[], _ufc_sb1[], _ufc_sb2[], _ufc_sb3[];
-
-#define SBA(sb, v) (*(long64*)((char*)(sb)+(v)))
-
-static ufc_long *_ufc_doit(ufc_long l1, ufc_long l2, ufc_long r1, ufc_long r2, ufc_long itr)
-  { int i;
-    long64 l, r, s, *k;
-
-    l = (((long64)l1) << 32) | ((long64)l2);
-    r = (((long64)r1) << 32) | ((long64)r2);
-
-    while(itr--) {
-      k = &_ufc_keytab[0];
-      for(i=8; i--; ) {
-	s = *k++ ^ r;
-	l ^= SBA(_ufc_sb3, (s >>  0) & 0xffff);
-        l ^= SBA(_ufc_sb2, (s >> 16) & 0xffff);
-        l ^= SBA(_ufc_sb1, (s >> 32) & 0xffff);
-        l ^= SBA(_ufc_sb0, (s >> 48) & 0xffff);
-
-	s = *k++ ^ l;
-	r ^= SBA(_ufc_sb3, (s >>  0) & 0xffff);
-        r ^= SBA(_ufc_sb2, (s >> 16) & 0xffff);
-        r ^= SBA(_ufc_sb1, (s >> 32) & 0xffff);
-        r ^= SBA(_ufc_sb0, (s >> 48) & 0xffff);
-      } 
-      s=l; l=r; r=s;
-    }
-
-    l1 = l >> 32; l2 = l & 0xffffffff;
-    r1 = r >> 32; r2 = r & 0xffffffff;
-    return _ufc_dofinalperm(l1, l2, r1, r2);
-  }
-
-#endif
-
-#define crypt ufc_crypt
-#endif
-
-main()
-{
-	char passwd[9];
-	char salt[9];
-	char c_out1[256];
-	char c_out2[256];
-
-	char expected_out[14];
-
-	strcpy(expected_out, "12yJ.Of/NQ.Pk");
-	strcpy(passwd, "12345678");
-	strcpy(salt, "12345678");
-	
-	strcpy(c_out1, crypt(passwd, salt));
-	salt[2] = '\0';
-	strcpy(c_out2, crypt(passwd, salt));
-
-	/*
-	 * If the non-trucated salt fails but the
-	 * truncated salt succeeds then exit 1.
-	 */
-
-	if((strcmp(c_out1, expected_out) != 0) && 
-		(strcmp(c_out2, expected_out) == 0))
-		exit(1);
-
-#ifdef HAVE_BIGCRYPT
-	/*
-	 * Try the same with bigcrypt...
-	 */
-
-	{
-		char big_passwd[17];
-		char big_salt[17];
-		char big_c_out1[256];
-		char big_c_out2[256];
-		char big_expected_out[27];
-
-		strcpy(big_passwd, "1234567812345678");
-		strcpy(big_salt, "1234567812345678");
-		strcpy(big_expected_out, "12yJ.Of/NQ.PklfyCuHi/rwM");
-
-		strcpy(big_c_out1, bigcrypt(big_passwd, big_salt));
-		big_salt[2] = '\0';
-		strcpy(big_c_out2, bigcrypt(big_passwd, big_salt));
-
-		/*
-		 * If the non-trucated salt fails but the
-		 * truncated salt succeeds then exit 1.
-		 */
-
-		if((strcmp(big_c_out1, big_expected_out) != 0) && 
-			(strcmp(big_c_out2, big_expected_out) == 0))
-			exit(1);
-
-	}
-#endif
-
-	exit(0);
-}
diff --git a/source4/tests/fcntl_lock.c b/source4/tests/fcntl_lock.c
deleted file mode 100644
index 3dc12a3897..0000000000
--- a/source4/tests/fcntl_lock.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* test whether fcntl locking works on this system */
-
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
-#include <errno.h>
-
-static int sys_waitpid(pid_t pid,int *status,int options)
-{
-#ifdef HAVE_WAITPID
-  return waitpid(pid,status,options);
-#else /* USE_WAITPID */
-  return wait4(pid, status, options, NULL);
-#endif /* USE_WAITPID */
-}
-
-#define DATA "conftest.fcntl"
-
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-
-/* lock a byte range in a open file */
-int main(int argc, char *argv[])
-{
-	struct flock lock;
-	int fd, ret, status=1;
-	pid_t pid;
-	char *testdir = NULL;
-
-	testdir = getenv("TESTDIR");
-	if (testdir) chdir(testdir);
-
-	alarm(10);
-
-	if (!(pid=fork())) {
-		sleep(2);
-		fd = open(DATA, O_RDONLY);
-
-		if (fd == -1) {
-			fprintf(stderr,"ERROR: failed to open %s (errno=%d)\n", 
-				DATA, (int)errno);
-			exit(1);
-		}
-
-		lock.l_type = F_WRLCK;
-		lock.l_whence = SEEK_SET;
-		lock.l_start = 0;
-		lock.l_len = 4;
-		lock.l_pid = getpid();
-		
-		lock.l_type = F_WRLCK;
-		
-		/* check if a lock applies */
-		ret = fcntl(fd,F_GETLK,&lock);
-
-		if ((ret == -1) ||
-		    (lock.l_type == F_UNLCK)) {
-			fprintf(stderr,"ERROR: lock test failed (ret=%d errno=%d)\n", ret, (int)errno);
-			exit(1);
-		} else {
-			exit(0);
-		}
-	}
-
-	unlink(DATA);
-	fd = open(DATA, O_RDWR|O_CREAT|O_EXCL, 0600);
-
-	if (fd == -1) {
-		fprintf(stderr,"ERROR: failed to open %s (errno=%d)\n", 
-			DATA, (int)errno);
-		exit(1);
-	}
-
-	lock.l_type = F_WRLCK;
-	lock.l_whence = SEEK_SET;
-	lock.l_start = 0;
-	lock.l_len = 4;
-	lock.l_pid = getpid();
-
-	/* set a 4 byte write lock */
-	fcntl(fd,F_SETLK,&lock);
-
-	sys_waitpid(pid, &status, 0);
-
-	unlink(DATA);
-
-#if defined(WIFEXITED) && defined(WEXITSTATUS)
-    if(WIFEXITED(status)) {
-        status = WEXITSTATUS(status);
-    } else {
-        status = 1;
-    }
-#else /* defined(WIFEXITED) && defined(WEXITSTATUS) */
-	status = (status == 0) ? 0 : 1;
-#endif /* defined(WIFEXITED) && defined(WEXITSTATUS) */
-
-	if (status) {
-		fprintf(stderr,"ERROR: lock test failed with status=%d\n", 
-			status);
-	}
-
-	exit(status);
-}
diff --git a/source4/tests/fcntl_lock64.c b/source4/tests/fcntl_lock64.c
deleted file mode 100644
index e5ecd88fd0..0000000000
--- a/source4/tests/fcntl_lock64.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* test whether 64 bit fcntl locking really works on this system */
-
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
-
-#include <errno.h>
-
-static int sys_waitpid(pid_t pid,int *status,int options)
-{
-#ifdef HAVE_WAITPID
-  return waitpid(pid,status,options);
-#else /* USE_WAITPID */
-  return wait4(pid, status, options, NULL);
-#endif /* USE_WAITPID */
-}
-
-#define DATA "conftest.fcntl64"
-
-/* lock a byte range in a open file */
-int main(int argc, char *argv[])
-{
-	struct flock64 lock;
-	int fd, ret, status=1;
-	pid_t pid;
-
-	if (!(pid=fork())) {
-		sleep(2);
-		fd = open64(DATA, O_RDONLY);
-
-		if (fd == -1) exit(1);
-
-		lock.l_type = F_WRLCK;
-		lock.l_whence = SEEK_SET;
-		lock.l_start = 0;
-		lock.l_len = 4;
-		lock.l_pid = getpid();
-		
-		lock.l_type = F_WRLCK;
-		
-		/* check if a lock applies */
-		ret = fcntl(fd,F_GETLK64,&lock);
-
-		if ((ret == -1) ||
-		    (lock.l_type == F_UNLCK)) {
-/*            printf("No lock conflict\n"); */
-			exit(1);
-		} else {
-/*            printf("lock conflict\n"); */
-			exit(0);
-		}
-	}
-
-	fd = open64(DATA, O_RDWR|O_CREAT|O_TRUNC, 0600);
-
-	lock.l_type = F_WRLCK;
-	lock.l_whence = SEEK_SET;
-#if defined(COMPILER_SUPPORTS_LL)
-	lock.l_start = 0x100000000LL;
-#else
-	lock.l_start = 0x100000000;
-#endif
-	lock.l_len = 4;
-	lock.l_pid = getpid();
-
-	/* set a 4 byte write lock */
-	fcntl(fd,F_SETLK64,&lock);
-
-	sys_waitpid(pid, &status, 0);
-
-#if defined(WIFEXITED) && defined(WEXITSTATUS)
-	if(WIFEXITED(status)) {
-		status = WEXITSTATUS(status);
-	} else {
-		status = 1;
-	}
-#else /* defined(WIFEXITED) && defined(WEXITSTATUS) */
-	status = (status == 0) ? 0 : 1;
-#endif /* defined(WIFEXITED) && defined(WEXITSTATUS) */
-
-	unlink(DATA);
-
-	exit(status);
-}
diff --git a/source4/tests/fcntl_lock_thread.c b/source4/tests/fcntl_lock_thread.c
deleted file mode 100644
index f31105626c..0000000000
--- a/source4/tests/fcntl_lock_thread.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* test whether fcntl locking works between threads on this Linux system */
-
-#include <unistd.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-#include <fcntl.h>
-
-#include <sys/fcntl.h>
-
-#include <sys/wait.h>
-
-#include <errno.h>
-#include <pthread.h>
-
-static int sys_waitpid(pid_t pid,int *status,int options)
-{
-  return waitpid(pid,status,options);
-}
-
-#define DATA "conftest.fcntl"
-
-#define SEEK_SET 0
-
-static void *test_thread(void *thread_parm)
-{
-	int *status = thread_parm;
-	int fd, ret;
-	struct flock lock;
-	
-	sleep(2);
-	fd = open(DATA, O_RDWR);
-
-	if (fd == -1) {
-		fprintf(stderr,"ERROR: failed to open %s (errno=%d)\n", 
-			DATA, (int)errno);
-		pthread_exit(thread_parm);
-	}
-
-	lock.l_type = F_WRLCK;
-	lock.l_whence = SEEK_SET;
-	lock.l_start = 0;
-	lock.l_len = 4;
-	lock.l_pid = 0;
-		
-	/* check if a lock applies */
-	ret = fcntl(fd,F_SETLK,&lock);
-	if ((ret != -1)) {
-		fprintf(stderr,"ERROR: lock test failed (ret=%d errno=%d)\n", ret, (int)errno);
-	} else {
-		*status = 0;  /* SUCCESS! */
-	}
-	pthread_exit(thread_parm);
-}
-
-/* lock a byte range in a open file */
-int main(int argc, char *argv[])
-{
-	struct flock lock;
-	int fd, ret, status=1, rc;
-	pid_t pid;
-	char *testdir = NULL;
-	pthread_t thread_id;
-	pthread_attr_t thread_attr;
-
-	testdir = getenv("TESTDIR");
-	if (testdir) chdir(testdir);
-
-	alarm(10);
-
-	pthread_attr_init(&thread_attr);
-	pthread_attr_setdetachstate(&thread_attr, PTHREAD_CREATE_DETACHED);
-	rc = pthread_create(&thread_id, &thread_attr, &test_thread, &status);
-	pthread_attr_destroy(&thread_attr);
-	if (rc == 0) {
-		fprintf(stderr,"created thread_id=%lu\n", 
-			(unsigned long int)thread_id);
-	} else {
-		fprintf(stderr,"ERROR: thread create failed, rc=%d\n", rc);
-	}
-
-	unlink(DATA);
-	fd = open(DATA, O_RDWR|O_CREAT|O_RDWR, 0600);
-
-	if (fd == -1) {
-		fprintf(stderr,"ERROR: failed to open %s (errno=%d)\n", 
-			DATA, (int)errno);
-		exit(1);
-	}
-
-	lock.l_type = F_WRLCK;
-	lock.l_whence = SEEK_SET;
-	lock.l_start = 0;
-	lock.l_len = 4;
-	lock.l_pid = getpid();
-
-	/* set a 4 byte write lock */
-	fcntl(fd,F_SETLK,&lock);
-
-	sleep(4);  /* allow thread to try getting lock */
-
-	unlink(DATA);
-
-#if defined(WIFEXITED) && defined(WEXITSTATUS)
-    if(WIFEXITED(status)) {
-        status = WEXITSTATUS(status);
-    } else {
-        status = 1;
-    }
-#else /* defined(WIFEXITED) && defined(WEXITSTATUS) */
-	status = (status == 0) ? 0 : 1;
-#endif /* defined(WIFEXITED) && defined(WEXITSTATUS) */
-
-	if (status) {
-		fprintf(stderr,"ERROR: lock test failed with status=%d\n", 
-			status);
-	}
-
-	exit(status);
-}
diff --git a/source4/tests/ftruncate.c b/source4/tests/ftruncate.c
deleted file mode 100644
index 93282782ee..0000000000
--- a/source4/tests/ftruncate.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* test whether ftruncte() can extend a file */
-
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define DATA "conftest.trunc"
-#define LEN 7663
-
-main()
-{
-	int *buf;
-	int fd = open(DATA,O_RDWR|O_CREAT|O_TRUNC,0666);
-
-	ftruncate(fd, LEN);
-
-	unlink(DATA);
-
-	if (lseek(fd, 0, SEEK_END) == LEN) {
-		exit(0);
-	}
-	exit(1);
-}
diff --git a/source4/tests/getgroups.c b/source4/tests/getgroups.c
deleted file mode 100644
index 343fd5a184..0000000000
--- a/source4/tests/getgroups.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* this tests whether getgroups actually returns lists of integers
-   rather than gid_t. The test only works if the user running
-   the test is in at least 1 group 
-
-   The test is designed to check for those broken OSes that define
-   getgroups() as returning an array of gid_t but actually return a
-   array of ints! Ultrix is one culprit
-  */
-
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <grp.h>
-
-main()
-{
-	int i;
-	int *igroups;
-	char *cgroups;
-	int grp = 0;
-	int  ngroups = getgroups(0,&grp);
-
-	if (sizeof(gid_t) == sizeof(int)) {
-		fprintf(stderr,"gid_t and int are the same size\n");
-		exit(1);
-	}
-
-	if (ngroups <= 0)
-		ngroups = 32;
-
-	igroups = (int *)malloc(sizeof(int)*ngroups);
-
-	for (i=0;i<ngroups;i++)
-		igroups[i] = 0x42424242;
-
-	ngroups = getgroups(ngroups,(gid_t *)igroups);
-
-	if (igroups[0] == 0x42424242)
-		ngroups = 0;
-
-	if (ngroups == 0) {
-		printf("WARNING: can't determine getgroups return type\n");
-		exit(1);
-	}
-	
-	cgroups = (char *)igroups;
-
-	if (ngroups == 1 && 
-	    cgroups[2] == 0x42 && cgroups[3] == 0x42) {
-		fprintf(stderr,"getgroups returns gid_t\n");
-		exit(1);
-	}
-	  
-	for (i=0;i<ngroups;i++) {
-		if (igroups[i] == 0x42424242) {
-			fprintf(stderr,"getgroups returns gid_t\n");
-			exit(1);
-		}
-	}
-
-	exit(0);
-}
diff --git a/source4/tests/shared_mmap.c b/source4/tests/shared_mmap.c
deleted file mode 100644
index fcef75d0d6..0000000000
--- a/source4/tests/shared_mmap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* this tests whether we can use a shared writeable mmap on a file -
-   as needed for the mmap varient of FAST_SHARE_MODES */
-
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define DATA "conftest.mmap"
-
-#ifndef MAP_FILE
-#define MAP_FILE 0
-#endif
-
-main()
-{
-	int *buf;
-	int i; 
-	int fd = open(DATA,O_RDWR|O_CREAT|O_TRUNC,0666);
-	int count=7;
-
-	if (fd == -1) exit(1);
-
-	for (i=0;i<10000;i++) {
-		write(fd,&i,sizeof(i));
-	}
-
-	close(fd);
-
-	if (fork() == 0) {
-		fd = open(DATA,O_RDWR);
-		if (fd == -1) exit(1);
-
-		buf = (int *)mmap(NULL, 10000*sizeof(int), 
-				   (PROT_READ | PROT_WRITE), 
-				   MAP_FILE | MAP_SHARED, 
-				   fd, 0);
-
-		while (count-- && buf[9124] != 55732) sleep(1);
-
-		if (count <= 0) exit(1);
-
-		buf[1763] = 7268;
-		exit(0);
-	}
-
-	fd = open(DATA,O_RDWR);
-	if (fd == -1) exit(1);
-
-	buf = (int *)mmap(NULL, 10000*sizeof(int), 
-			   (PROT_READ | PROT_WRITE), 
-			   MAP_FILE | MAP_SHARED, 
-			   fd, 0);
-
-	if (buf == (int *)-1) exit(1);
-
-	buf[9124] = 55732;
-
-	while (count-- && buf[1763] != 7268) sleep(1);
-
-	unlink(DATA);
-		
-	if (count > 0) exit(0);
-	exit(1);
-}
diff --git a/source4/tests/shlib.c b/source4/tests/shlib.c
deleted file mode 100644
index 761d9fd5c5..0000000000
--- a/source4/tests/shlib.c
+++ /dev/null
@@ -1,6 +0,0 @@
-/* a trivial function used to test building shared libraries */
-
-int foo(void)
-{
-	return 1;
-}
diff --git a/source4/tests/summary.c b/source4/tests/summary.c
deleted file mode 100644
index d3708c236c..0000000000
--- a/source4/tests/summary.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <stdio.h>
-
-main()
-{
-#if !(defined(HAVE_FCNTL_LOCK) || defined(HAVE_STRUCT_FLOCK64))
-	printf("ERROR: No locking available. Running Samba would be unsafe\n");
-	exit(1);
-#endif
-
-#if !(defined(HAVE_IFACE_IFCONF) || defined(HAVE_IFACE_IFREQ) || defined(HAVE_IFACE_AIX))
-	printf("WARNING: No automated network interface determination\n");
-#endif
-
-#if !(defined(USE_SETEUID) || defined(USE_SETREUID) || defined(USE_SETRESUID) || defined(USE_SETUIDX))
-	printf("ERROR: no seteuid method available\n");
-	/* REWRITE: exit(1); */
-#endif
-
-#if !(defined(STAT_STATVFS) || defined(STAT_STATVFS64) || defined(STAT_STATFS3_OSF1) || defined(STAT_STATFS2_BSIZE) || defined(STAT_STATFS4) || defined(STAT_STATFS2_FSIZE) || defined(STAT_STATFS2_FS_DATA))
-	printf("ERROR: No disk free routine!\n");
-	exit(1);
-#endif
-
-#if !((defined(HAVE_RANDOM) || defined(HAVE_RAND)) && (defined(HAVE_SRANDOM) || defined(HAVE_SRAND)))
-    printf("ERROR: No random or srandom routine!\n");
-    exit(1);
-#endif
-
-	exit(0);
-}
diff --git a/source4/tests/trivial.c b/source4/tests/trivial.c
deleted file mode 100644
index 2723637a0f..0000000000
--- a/source4/tests/trivial.c
+++ /dev/null
@@ -1,4 +0,0 @@
-main()
-{
-	exit(0);
-}
diff --git a/source4/tests/unixsock.c b/source4/tests/unixsock.c
deleted file mode 100644
index f2765d68f6..0000000000
--- a/source4/tests/unixsock.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- c-file-style: "linux" -*-
- *
- * Try creating a Unix-domain socket, opening it, and reading from it.
- * The POSIX name for these is AF_LOCAL/PF_LOCAL.
- *
- * This is used by the Samba autoconf scripts to detect systems which
- * don't have Unix-domain sockets, such as (probably) VMS, or systems
- * on which they are broken under some conditions, such as RedHat 7.0
- * (unpatched).  We can't build WinBind there at the moment.
- *
- * Coding standard says to always use exit() for this, not return, so
- * we do.
- *
- * Martin Pool <mbp@samba.org>, June 2000. */
-
-/* TODO: Look for AF_LOCAL (most standard), AF_UNIX, and AF_FILE. */
-
-#include <stdio.h>
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-#ifdef HAVE_SYS_UN_H
-#  include <sys/un.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-#if HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-#if HAVE_ERRNO_DECL
-# include <errno.h>
-#else
-extern int errno;
-#endif
-
-static int bind_socket(char const *filename)
-{
-	int sock_fd;
-	struct sockaddr_un name;
-	size_t size;
-	
-	/* Create the socket. */
-	if ((sock_fd = socket(PF_LOCAL, SOCK_STREAM, 0)) < 0) {
-		perror ("socket(PF_LOCAL, SOCK_STREAM)");
-		exit(1);
-	}
-     
-	/* Bind a name to the socket. */
-	name.sun_family = AF_LOCAL;
-	strncpy(name.sun_path, filename, sizeof (name.sun_path));
-     
-       /* The size of the address is
-          the offset of the start of the filename,
-          plus its length,
-          plus one for the terminating null byte.
-          Alternatively you can just do:
-          size = SUN_LEN (&name);
-      */
-	size = SUN_LEN(&name);
-	/* XXX: This probably won't work on unfriendly libcs */
-     
-	if (bind(sock_fd, (struct sockaddr *) &name, size) < 0) {
-		perror ("bind");
-		exit(1);
-	}
-
-	return sock_fd;
-}
-
-
-int main(void)
-{
-	int sock_fd;
-	int kid;
-	char const *filename = "conftest.unixsock.sock";
-
-	/* abolish hanging */
-	alarm(15);		/* secs */
-
-	if ((sock_fd = bind_socket(filename)) < 0)
-		exit(1);
-
-	/* the socket will be deleted when autoconf cleans up these
-           files. */
-
-	exit(0);
-}