Update the opal_bitmap test

This commit was SVN r22545.

test/class/opal_bitmap.c

@@ -48,14 +48,18 @@ int main(int argc, char *argv[])
     opal_bitmap_t bm;
     int err;
     
+    fprintf(stderr, "Bitmap test starting\n");
     /* Perform overall test initialization */
     test_init("opal_bitmap_t");
-
+    fprintf(stderr, "...initialized\n");
+    error_out = stderr;
+#if 0
 #ifdef STANDALONE
     error_out = stderr;
 #else
     error_out = fopen( "./opal_bitmap_test_out.txt", "w" );
     if( error_out == NULL ) error_out = stderr;
+#endif
 #endif
     /* Initialize bitmap  */
 
@@ -162,15 +166,12 @@ void test_bitmap_is_set(opal_bitmap_t *bm)
     is_set_bit(bm, 31);
     is_set_bit(bm, 32);
 
-    PRINT_VALID_ERR;
     result = is_set_bit(bm, 1122);
-    TEST_AND_REPORT(result,ERR_CODE,"opal_bitmap_is_set_bit");    
-    PRINT_VALID_ERR;
+    TEST_AND_REPORT(result,0,"opal_bitmap_is_set_bit");    
     is_set_bit(bm, -33);
-    TEST_AND_REPORT(result,ERR_CODE,"opal_bitmap_is_set_bit");    
-    PRINT_VALID_ERR;
+    TEST_AND_REPORT(result,0,"opal_bitmap_is_set_bit");    
     is_set_bit(bm, -1);
-    TEST_AND_REPORT(result,ERR_CODE,"opal_bitmap_is_set_bit");    
+    TEST_AND_REPORT(result,0,"opal_bitmap_is_set_bit");    
 }
 
 
@@ -250,14 +251,26 @@ int clear_bit(opal_bitmap_t *bm, int bit)
 
 int is_set_bit(opal_bitmap_t *bm, int bit) 
 {
-    int result = opal_bitmap_is_set_bit(bm, bit);
-    if (((1 == result) 
-	&& !(bm->bitmap[bit/SIZE_OF_CHAR] & (1 << bit % SIZE_OF_CHAR)))
-	|| (result < 0)
-	|| ((0 == result) 
-	    &&(bm->bitmap[bit/SIZE_OF_CHAR] & (1 << bit % SIZE_OF_CHAR)))) {
-	fprintf(error_out, "ERROR: is_set_bit for bit = %d \n\n",bit);
-	return ERR_CODE;
+    bool result = opal_bitmap_is_set_bit(bm, bit);
+    
+    if (result) {
+        if (bit < 0) {
+            fprintf(error_out, "ERROR: is_set_bit for bit = %d \n\n",bit);
+            return ERR_CODE;
+        }
+        if (!(bm->bitmap[bit/SIZE_OF_CHAR] & (1 << bit % SIZE_OF_CHAR))) {
+            fprintf(error_out, "ERROR: is_set_bit for bit = %d \n\n",bit);
+            return ERR_CODE;
+        }
+        return 0;
+    }
+    
+	if (!result) {
+        if (0 <= bit && bit <= bm->array_size && !(bm->bitmap[bit/SIZE_OF_CHAR] & (1 << bit % SIZE_OF_CHAR))) {
+            fprintf(error_out, "ERROR: is_set_bit for bit = %d \n\n",bit);
+            return ERR_CODE;
+        }
+        return 0;
     }
 	
     return 0;