Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/strrstr.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/strrstr.c (modified) (3 diffs)

branches/3.3/mindi-busybox/libbb/strrstr.c

@@ -8 +8 @@
  */
 
-#ifdef __DO_STRRSTR_TEST
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#else
 #include "libbb.h"
-#endif
 
 /*
@@ -35 +29 @@
 }
 
-#ifdef __DO_STRRSTR_TEST
-int main(int argc, char **argv)
+#if ENABLE_UNIT_TEST
+
+BBUNIT_DEFINE_TEST(strrstr)
 {
     static const struct {
@@ -60 +55 @@
     while (i < sizeof(test_array) / sizeof(test_array[0])) {
         const char *r = strrstr(test_array[i].h, test_array[i].n);
-        printf("'%s' vs. '%s': '%s' - ", test_array[i].h, test_array[i].n, r);
         if (r == NULL)
             r = test_array[i].h - 1;
-        printf("%s\n", r == test_array[i].h + test_array[i].pos ? "PASSED" : "FAILED");
+        BBUNIT_ASSERT_EQ(r, test_array[i].h + test_array[i].pos);
         i++;
     }
 
-    return 0;
+    BBUNIT_ENDTEST;
 }
-#endif
+
+#endif /* ENABLE_UNIT_TEST */