Index: trunk/psLib/test/collections/builddir/tst_psBitSet_07.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_07.d	(revision 1170)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_07.d	(revision 1170)
@@ -0,0 +1,9 @@
+builddir/tst_psBitSet_07.o: tst_psBitSet_07.c ../../include/pslib.h \
+  ../../include/psMemory.h ../../include/psLogMsg.h \
+  ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
+  ../../include/psString.h ../../include/psType.h ../../include/psList.h \
+  ../../include/psCompare.h ../../include/psVector.h \
+  ../../include/psHash.h ../../include/psScalar.h ../../include/psImage.h \
+  ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h
Index: trunk/psLib/test/collections/tst_psBitSet_07.c
===================================================================
--- trunk/psLib/test/collections/tst_psBitSet_07.c	(revision 1170)
+++ trunk/psLib/test/collections/tst_psBitSet_07.c	(revision 1170)
@@ -0,0 +1,95 @@
+
+/** @file  tst_psBitSet_07.c
+ *
+ *  @brief Test driver for psBitSet functions
+ *
+ *  This test driver contains the following tests for psBitSet test point 7:
+ *     A)  Create psBitSets of non-multiple of 8 bits
+ *     B)  Set psBitSets to 0x3 and 0x5
+ *     C)  Perform AND, OR, and XOR
+ *     D)  Free psBitSets
+ *
+ *  @author  Ross Harman, MHPCC
+ *
+ *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-07-01 18:57:30 $
+ *
+ *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
+ *
+ */
+
+#include "pslib.h"
+#include "psTest.h"
+
+int main(int argc,
+         char* argv[])
+{
+    char *binOut1 = NULL;
+    char *binOut2 = NULL;
+    char *binOut3 = NULL;
+
+    // Test A - Create psBitSet
+    printPositiveTestHeader(stdout,"psBitSet", "Create psBitSets of non-multiple of 8 bits");
+    printf("Creating psBitSets\n");
+    psBitSet* bs1 = psBitSetAlloc(3);
+    psBitSet* bs2 = psBitSetAlloc(3);
+    psBitSet* bs3 = psBitSetAlloc(3);
+    binOut1 = psBitSetToString(bs1);
+    binOut2 = psBitSetToString(bs2);
+    printf("%s\n", binOut1);
+    printf("%s\n\n", binOut2);
+    psFree(binOut1);
+    psFree(binOut2);
+    printFooter(stdout, "psBitSet", "Create psBitSets of non-multiple of 8 bits", true);
+
+
+    // Test B - Set bits to 0x3 and 0x5
+    printPositiveTestHeader(stdout, "psBitSet", "Set psBitSets to 0x3 and 0x5");
+    bs1 = psBitSetSet(bs1, 0);
+    bs1 = psBitSetSet(bs1, 1);
+    bs2 = psBitSetSet(bs2, 0);
+    bs2 = psBitSetSet(bs2, 2);
+    binOut1 = psBitSetToString(bs1);
+    binOut2 = psBitSetToString(bs2);
+    printf("%s\n", binOut1);
+    printf("%s\n\n", binOut2);
+    psFree(binOut1);
+    psFree(binOut2);
+    printFooter(stdout, "psBitSet", "Set psBitSets to 0x3 and 0x5", true);
+
+
+    // Test C - Perform AND, OR, and XOR
+    printPositiveTestHeader(stdout, "psBitSet", "Perform AND, OR, and XOR");
+    printf("AND:\n");
+    bs3 = psBitSetOp(bs3, bs1, "AND", bs2);
+    binOut3 = psBitSetToString(bs3);
+    printf("%s\n", binOut3);
+    psFree(binOut3);
+    printf("OR:\n");
+    bs3 = psBitSetOp(bs3, bs1, "OR", bs2);
+    binOut3 = psBitSetToString(bs3);
+    printf("%s\n", binOut3);
+    psFree(binOut3);
+    printf("XOR:\n");
+    bs3 = psBitSetOp(bs3, bs1, "XOR", bs2);
+    binOut3 = psBitSetToString(bs3);
+    printf("%s\n", binOut3);
+    psFree(binOut3);
+    printFooter(stdout, "psBitSet", "Perform AND, OR, and XOR", true);
+
+
+    // Test D - Free psBitSets
+    printPositiveTestHeader(stdout, "psBitSet", "Free psBitSets");
+    psFree(bs1);
+    psFree(bs2);
+    psFree(bs3);
+    psMemCheckLeaks(0, NULL, stdout);
+    psMemCheckCorruption(0);
+    int nBad = psMemCheckCorruption(0);
+    if(nBad) {
+        printf("ERROR: Found %d bad memory blocks\n", nBad);
+    }
+    printFooter(stdout, "psBitSet", "Free psBitSets", true);
+
+    return 0;
+}
Index: trunk/psLib/test/collections/verified/tst_psBitSet_07.stdout
===================================================================
--- trunk/psLib/test/collections/verified/tst_psBitSet_07.stdout	(revision 1170)
+++ trunk/psLib/test/collections/verified/tst_psBitSet_07.stdout	(revision 1170)
@@ -0,0 +1,49 @@
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psBitSet_07.c                                          *
+*            TestPoint: psBitSet{Create psBitSets of non-multiple of 8 bits}       *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+Creating psBitSets
+00000000
+00000000
+
+
+---> TESTPOINT PASSED (psBitSet{Create psBitSets of non-multiple of 8 bits} | tst_psBitSet_07.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psBitSet_07.c                                          *
+*            TestPoint: psBitSet{Set psBitSets to 0x3 and 0x5}                     *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+00000011
+00000101
+
+
+---> TESTPOINT PASSED (psBitSet{Set psBitSets to 0x3 and 0x5} | tst_psBitSet_07.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psBitSet_07.c                                          *
+*            TestPoint: psBitSet{Perform AND, OR, and XOR}                         *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+AND:
+00000001
+OR:
+00000111
+XOR:
+00000110
+
+---> TESTPOINT PASSED (psBitSet{Perform AND, OR, and XOR} | tst_psBitSet_07.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psBitSet_07.c                                          *
+*            TestPoint: psBitSet{Free psBitSets}                                   *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psBitSet{Free psBitSets} | tst_psBitSet_07.c)
+