Changeset 1079 in MondoRescue for trunk/mondo/src/test

Timestamp:

Jan 28, 2007, 5:58:18 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1045:1078 £SVN_M/branches/stable

Location:

trunk/mondo/src/test

Files:

• mktest (modified) (2 diffs)
• mondo.conf (modified) (1 diff)
• test-conf.c (modified) (2 diffs, 1 prop)
• test-conf.res (modified) (1 diff)
• test-msg.c (copied) (copied from branches/stable/mondo/src/test/test-msg.c )
• test-msg.res (copied) (copied from branches/stable/mondo/src/test/test-msg.res )
• test-string.c (modified) (2 diffs, 1 prop)
• test-string.res (modified) (1 diff)

trunk/mondo/src/test/mktest

@@ -6 +6 @@
 #
 
-gcc -O2 -I../common -I../lib test-conf.c ../lib/mr_conf.c ../common/libmondo-msg.c -o test-conf
-gcc -O2 -I../common -I../lib test-string.c ../lib/mr_str.c -o test-string
+lib="../lib/mr_conf.c ../lib/mr_msg.c ../lib/mr_err.c ../lib/mr_mem.c"
+OPT="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_REENTRANT -Wstrict-prototypes -Wshadow -funsigned-char -Wunused -Winit-self -Wcast-align -O2 -g -I../common -I../include"
 
-for f in "test-conf"; do
+echo "Generating test-msg"
+gcc $OPT test-msg.c $lib -o test-msg
+echo "Generating test-string"
+gcc $OPT test-string.c ../lib/mr_str.c $lib -o test-string
+echo "Generating test-conf"
+gcc $OPT test-conf.c $lib -o test-conf
+
+echo "Testing against previous run"
+for f in test-conf test-string test-msg; do
     chmod 755 $f
     ./$f > /tmp/$f.res
@@ -16 +24 @@
         echo "$f test KO !!"
     fi
+    valgrind -q --error-exitcode=1 --leak-check=yes ./$f 2>&1 > /tmp/valgrind-$f.res
+    if [ $? -ne 0 ]; then
+        echo "valgrind $f test KO !!"
+    fi
 done

trunk/mondo/src/test/mondo.conf

@@ -5 +5 @@
 # Test conf file for mondo
 testfalse = TRUE
+# For msg tests
+logfile = "/tmp/mondo-test.log"
+loglevel = 3

trunk/mondo/src/test/test-conf.c

@@ -7 +7 @@
 
 #include <stdio.h>
-#include "my-stuff.h"
+#include <stdlib.h>
+
 #include "mr_conf.h"
 #include "mr_mem.h"
@@ -14 +15 @@
 int g_buffer_pid = 0;
 
-main() {
+int main(void) {
     int ret = 0;
     int i = 0;

trunk/mondo/src/test/test-conf.res

@@ -1 +1 @@
 Integer : ***3***
 Float : ***32.670000***
-String : ***"The big string"***
+String : ***The big string***

trunk/mondo/src/test/test-string.c

@@ -6 +6 @@
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "my-stuff.h"
 #include "mr_str.h"
 #include "mr_mem.h"
 
-main() {
+int main(void) {
     const char delims[3] = ": \n";
     
@@ -31 +29 @@
     }
     mr_free(string);
+
     exit(0);
 }

trunk/mondo/src/test/test-string.res

@@ -6 +6 @@
 token=|hda1[0]|, lastpos=28
 token=|hda12[3]|, lastpos=37
-token=|hda6[2]]|, lastpos=45
-token=|hda5[1]]|, lastpos=53
+token=|hda6[2]|, lastpos=45
+token=|hda5[1]|, lastpos=53