diff --git a/src/run-tests.pl b/src/run-tests.pl index 0e84b4a..3b7d07b 100755 --- a/src/run-tests.pl +++ b/src/run-tests.pl @@ -22,97 +22,97 @@ my @x01 = ( #show("01", "01", "", "", ""); my @X01 = ( + [ "", "", "" ], [ 10, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 5, 5, "T", 6, 6, "FT", 7, 7, "FT", 9, 9, "", 10, 10, "" ], [ 10, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 5, 5, "T", 7, 7, "FT", 8, 8, "T", 9, 10, "", 10, 9, "" ], [ 9, 0, 9, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 5, 5, "T", 6, 0, "", 7, 7, "FT", 0, 8, "", 10, 9, "", 9, 10, "" ], - [ "", "", "" ], ); test(\@x01, \@X01); #show("01", "02", "", "", "Expunge Both\n"); my @X02 = ( + [ "", "", "Expunge Both\n" ], [ 10, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 9, 9, "", 10, 10, "" ], [ 10, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 9, 10, "", 10, 9, "" ], [ 9, 0, 9, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 10, 9, "", 9, 10, "" ], - [ "", "", "Expunge Both\n" ], ); test(\@x01, \@X02); #show("01", "03", "", "", "Expunge Slave\n"); my @X03 = ( + [ "", "", "Expunge Slave\n" ], [ 10, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 5, 5, "T", 6, 6, "FT", 7, 7, "FT", 9, 9, "", 10, 10, "" ], [ 10, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 9, 10, "", 10, 9, "" ], [ 9, 0, 9, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 5, 5, "T", 6, 0, "", 7, 7, "FT", 10, 9, "", 9, 10, "" ], - [ "", "", "Expunge Slave\n" ], ); test(\@x01, \@X03); #show("01", "04", "", "", "Sync Pull\n"); my @X04 = ( + [ "", "", "Sync Pull\n" ], [ 9, 1, 1, "F", 2, 2, "", 3, 3, "FS", 4, 4, "", 5, 5, "T", 6, 6, "F", 7, 7, "FT", 9, 9, "" ], [ 9, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 5, 5, "T", 7, 7, "FT", 8, 8, "T", 9, 9, "", 10, 0, "" ], [ 9, 0, 0, 1, 1, "F", 2, 2, "", 3, 3, "FS", 4, 4, "", 5, 5, "T", 6, 6, "", 7, 7, "FT", 0, 8, "", 9, 9, "" ], - [ "", "", "Sync Pull\n" ], ); test(\@x01, \@X04); #show("01", "05", "", "", "Sync Flags\n"); my @X05 = ( + [ "", "", "Sync Flags\n" ], [ 8, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 5, 5, "T", 6, 6, "F", 7, 7, "FT", 9, 0, "" ], [ 8, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 5, 5, "T", 7, 7, "FT", 8, 8, "", 10, 0, "" ], [ 8, 0, 0, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 5, 5, "T", 6, 6, "", 7, 7, "FT", 8, 8, "" ], - [ "", "", "Sync Flags\n" ], ); test(\@x01, \@X05); #show("01", "06", "", "", "Sync Delete\n"); my @X06 = ( + [ "", "", "Sync Delete\n" ], [ 8, 1, 1, "F", 2, 2, "", 3, 3, "FS", 4, 4, "", 5, 5, "T", 6, 6, "FT", 7, 7, "FT", 9, 0, "" ], [ 8, 1, 1, "", 2, 2, "F", 3, 3, "F", 4, 4, "", 5, 5, "", 7, 7, "", 8, 8, "T", 10, 0, "" ], [ 8, 0, 0, 1, 1, "", 2, 2, "", 3, 3, "", 4, 4, "", 5, 5, "", 6, 0, "", 7, 7, "", 0, 8, "" ], - [ "", "", "Sync Delete\n" ], ); test(\@x01, \@X06); #show("01", "07", "", "", "Sync New\n"); my @X07 = ( + [ "", "", "Sync New\n" ], [ 10, 1, 1, "F", 2, 2, "", 3, 3, "FS", 4, 4, "", 5, 5, "T", 6, 6, "F", 7, 7, "FT", 9, 9, "", 10, 10, "" ], [ 10, 1, 1, "", 2, 2, "F", 3, 3, "F", 4, 4, "", 5, 5, "", 7, 7, "", 8, 8, "", 9, 10, "", 10, 9, "" ], [ 9, 0, 9, 1, 1, "", 2, 2, "", 3, 3, "", 4, 4, "", 5, 5, "", 6, 6, "", 7, 7, "", 8, 8, "", 10, 9, "", 9, 10, "" ], - [ "", "", "Sync New\n" ], ); test(\@x01, \@X07); #show("01", "08", "", "", "Sync PushFlags PullDelete\n"); my @X08 = ( + [ "", "", "Sync PushFlags PullDelete\n" ], [ 8, 1, 1, "F", 2, 2, "F", 3, 3, "FS", 4, 4, "", 5, 5, "T", 6, 6, "F", 7, 7, "FT", 9, 0, "" ], [ 8, 1, 1, "", 2, 2, "F", 3, 3, "F", 4, 4, "", 5, 5, "", 7, 7, "", 8, 8, "T", 10, 0, "" ], [ 8, 0, 0, 1, 1, "", 2, 2, "F", 3, 3, "F", 4, 4, "", 5, 5, "", 6, 6, "", 7, 7, "", 0, 8, "" ], - [ "", "", "Sync PushFlags PullDelete\n" ], ); test(\@x01, \@X08); @@ -304,8 +304,8 @@ sub test($$) { my ($sx, $tx) = @_; mkchan($$sx[0], $$sx[1], @{ $$sx[2] }); - &runsync(@{ $$tx[3] }); - ckchan(fcfg(@{ $$tx[3] }), $$tx[0], $$tx[1], @{ $$tx[2] }); + &runsync(@{ $$tx[0] }); + ckchan(fcfg(@{ $$tx[0] }), $$tx[1], $$tx[2], @{ $$tx[3] }); rmtree "slave"; rmtree "master"; } @@ -366,8 +366,8 @@ sub show($$@) print ");\n"; &runsync(@sfx); print "my \@X$tx = (\n"; - showchan(); print " [ ".join(", ", map('"'.qm($_).'"', @sfx))." ],\n"; + showchan(); print ");\n"; print "test(\\\@x$sx, \\\@X$tx);\n\n"; rmtree "slave";