Improving Makefile about valgrind tests

diff --git a/Makefile b/Makefile
index 366da39896bbb568aac7e93b0cbc06d7ea39beb6..f4f2fda233e3477716a12d75e7275c082a75399f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,30 @@ dbgsendr:  clean debug
                    $(TODO)
 
 #--------------------------------------------------------------------
-valsend        :  clean debug
+#procedure to check programe against valgrind
+#VALKIND= "definite,possible,indirect,reachable"
+VALKIND        = "definite,possible,indirect"
+
+valrcvr        :  debug
+          @                                            \
+            valgrind                                   \
+               --leak-check=full                       \
+               --show-leak-kinds=$(VALKIND)            \
+              bin/receiver                             \
+               -f                                      \
+               $(EMLPAR)$(TESTITER)
+
+valsortr:  debug
+          @                                            \
+            valgrind                                   \
+               --leak-check=full                       \
+               bin/sorter                              \
+                  -f                                   \
+                  -d 2                                 \
+                  -c ./conf/mailleur.conf.dvl          \
+                  -r $(TESTDIR) 
+
+valsendr:  debug
           @                                            \
             valgrind                                   \
                --leak-check=full                       \
@@ -151,20 +174,6 @@ valsend    :  clean debug
                 -r $(TESTDIR)                          \
                   `basename -a $(TESTDIR)/var/spool/$(APPNAME)/queue/*.todo  | \
                        tr '\\n' ' ' `
-
-sender :  clean debug newtest
-          @ rm -fr $(TESTDIR)/var/spool/$(APPNAME)/queue
-          @ mkdir -p $(TESTDIR)/var/spool/$(APPNAME)/queue
-          @ cp -a                                      \
-               ./data-$@/*                             \
-               $(TESTDIR)/var/spool/$(APPNAME)/queue/
-          @ ./bin/$@                                   \
-                  -d 2                                 \
-                  -c ./conf/mailleur.conf.dvl          \
-                  -r $(TESTDIR)                        \
-                  `basename -a data-sender/*.todo  |   \
-                       tr '\\n' ' ' `
-
 #--------------------------------------------------------------------
 #testing feed
 ONEFEED=feed03.tst
@@ -271,15 +280,6 @@ tlsref:
 #--------------------------------------------------------------------
 #starting email receiver
 
-emlrcvr        :  clean debug newtest #starting email receiver
-          @ echo
-          @ echo "--------------"
-          @ echo "starting $@"
-          @ $(TESTDIR)/$(SBINDIR)/$@                   \
-               -f                                      \
-               $(EMLPAR)$(TESTITER)
-          @ echo "--------------"
-
 eml465 :  prepare
           @ echo
           @ echo "--------------"
@@ -290,22 +290,6 @@ eml465     :  prepare
                -r $(TESTDIR)                           \
                smtps:$(TESTIP):1065:1
 
-#VALKIND= "definite,possible,indirect,reachable"
-VALKIND        = "definite,possible,indirect"
-valrcvr        :  prepare                      #valgring of emlrcvr
-          @ echo "emlrec valgrind test"
-          @ valgrind                                   \
-               --leak-check=full                       \
-               --show-leak-kinds=$(VALKIND)            \
-                $(TESTDIR)/$(SBINDIR)/emlrcvr          \
-                       -f                              \
-                       -d 3                            \
-                       $(EMLPAR)
-            
-#              --track-fds=yes                         \
-#              --track-origins=yes                     \
-#              --trace-children=no                     \
-
 
 prepare        :  clean debug newtest