diff regression/regression-tests.bash @ 150:06aa84023b48

rename some structure fields to reflect our better understanding of the pst format
author Carl Byington <carl@five-ten-sg.com>
date Thu, 05 Mar 2009 08:23:32 -0800
parents b47d04257b43
children cda7c812ec01
line wrap: on
line diff
--- a/regression/regression-tests.bash	Sat Feb 28 11:55:48 2009 -0800
+++ b/regression/regression-tests.bash	Thu Mar 05 08:23:32 2009 -0800
@@ -13,6 +13,21 @@
 }
 
 
+function doldif()
+{
+    n="$1"
+    fn="$2"
+    echo $fn
+    ba=$(basename "$fn" .pst)
+    rm -rf output$n
+    mkdir output$n
+    #$val ../src/pst2ldif -d dumper -b 'o=ams-cc.com, c=US' -c 'newPerson' -o $fn >$ba.ldif.err 2>&1
+    $val ../src/pst2ldif -d dumper -b 'o=ams-cc.com, c=US' -c 'inetOrgPerson' $fn >$ba.ldif.err 2>&1
+         ../src/readpstlog -f I dumper >$ba.ldif.log
+    rm -f dumper
+}
+
+
 function dopst()
 {
     n="$1"
@@ -26,10 +41,6 @@
     $val ../src/readpst -cv -o output$n -d dumper $fn >$ba.err 2>&1
          ../src/readpstlog -f I dumper >$ba.log
 
-    #$val ../src/pst2ldif -d dumper -b 'o=ams-cc.com, c=US' -c 'newPerson' -o $fn >$ba.ldif.err 2>&1
-    #$val ../src/pst2ldif -d dumper -b 'o=ams-cc.com, c=US' -c 'inetOrgPerson' $fn >$ba.ldif.err 2>&1
-    #     ../src/readpstlog -f I dumper >$ba.ldif.log
-
     #../src/getidblock -d -p $fn 0 >$ba.fulldump
     #../src/readpstlog -f I getidblock.log >$ba.fulldump.log
 
@@ -39,7 +50,7 @@
 
 
 val="valgrind --leak-check=full"
-#val=''
+val=''
 
 pushd ..
 make || exit
@@ -50,25 +61,46 @@
     dodii 2 sample_64.pst
     dodii 3 test.pst
     dodii 4 big_mail.pst
+elif [ "$1" == "ldif" ]; then
+    #doldif   1 ams.pst
+    #doldif   2 sample_64.pst
+    #doldif   3 test.pst
+    #doldif   4 big_mail.pst
+    #doldif   5 mbmg.archive.pst
+    #doldif   6 Single2003-read.pst
+    #doldif   7 Single2003-unread.pst
+    #doldif   8 ol2k3high.pst
+    #doldif   9 ol97high.pst
+    #doldif  10 returned_message.pst
+    #doldif  11 flow.pst
+    #doldif  12 test-html.pst
+    #doldif  13 test-text.pst
+    #doldif  14 joe.romanowski.pst
+    #doldif  15 hourig1.pst
+    #doldif  16 hourig2.pst
+    #doldif  17 hourig3.pst
+    #doldif  18 test-mac.pst
+    doldif  19 harris.pst
 else
-   dopst   1 ams.pst
-   dopst   2 sample_64.pst
-   dopst   3 test.pst
-   dopst   4 big_mail.pst
-   dopst   5 mbmg.archive.pst
-   dopst   6 Single2003-read.pst
-   dopst   7 Single2003-unread.pst
-   dopst   8 ol2k3high.pst
-   dopst   9 ol97high.pst
-   dopst  10 returned_message.pst
-   dopst  11 flow.pst
-   dopst  12 test-html.pst
-   dopst  13 test-text.pst
-   dopst  14 joe.romanowski.pst
-   dopst  15 hourig1.pst
-   #dopst  16 hourig2.pst
-   #dopst  17 hourig3.pst
-   dopst  18 test-mac.pst
+    dopst   1 ams.pst
+    dopst   2 sample_64.pst
+    dopst   3 test.pst
+    dopst   4 big_mail.pst
+    dopst   5 mbmg.archive.pst
+    dopst   6 Single2003-read.pst
+    dopst   7 Single2003-unread.pst
+    dopst   8 ol2k3high.pst
+    dopst   9 ol97high.pst
+    dopst  10 returned_message.pst
+    dopst  11 flow.pst
+    dopst  12 test-html.pst
+    dopst  13 test-text.pst
+    dopst  14 joe.romanowski.pst
+    dopst  15 hourig1.pst
+    #dopst  16 hourig2.pst
+    #dopst  17 hourig3.pst
+    dopst  18 test-mac.pst
+    dopst  19 harris.pst
 fi
 
 grep 'lost:' *err | grep -v 'lost: 0 '