autotest: let mkchan() take an atomic channel state
this is consistent with ckchan() and printchan().
This commit is contained in:
parent
7f38c5dc53
commit
9f9a2af959
|
@ -482,7 +482,7 @@ sub show($$$)
|
||||||
my ($sp, $sfx);
|
my ($sp, $sfx);
|
||||||
eval "\$sp = \\\@x$sx";
|
eval "\$sp = \\\@x$sx";
|
||||||
eval "\$sfx = \\\@O$sfxn";
|
eval "\$sfx = \\\@O$sfxn";
|
||||||
mkchan($$sp[0], $$sp[1], $$sp[2]);
|
mkchan($sp);
|
||||||
print "my \@x$sx = (\n";
|
print "my \@x$sx = (\n";
|
||||||
showchan("near/.mbsyncstate");
|
showchan("near/.mbsyncstate");
|
||||||
print ");\n";
|
print ");\n";
|
||||||
|
@ -519,10 +519,12 @@ sub mkbox($$)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# \@far_state, \@near_state, \@sync_state
|
# \@chan_state
|
||||||
sub mkchan($$$)
|
sub mkchan($)
|
||||||
{
|
{
|
||||||
my ($f, $n, $t) = @_;
|
my ($cs) = @_;
|
||||||
|
|
||||||
|
my ($f, $n, $t) = @$cs;
|
||||||
mkbox("far", $f);
|
mkbox("far", $f);
|
||||||
mkbox("near", $n);
|
mkbox("near", $n);
|
||||||
open(FILE, ">", "near/.mbsyncstate") or
|
open(FILE, ">", "near/.mbsyncstate") or
|
||||||
|
@ -701,7 +703,7 @@ sub test_impl($$$$)
|
||||||
{
|
{
|
||||||
my ($async, $sx, $tx, $sfx) = @_;
|
my ($async, $sx, $tx, $sfx) = @_;
|
||||||
|
|
||||||
mkchan($$sx[0], $$sx[1], $$sx[2]);
|
mkchan($sx);
|
||||||
|
|
||||||
my ($xc, $ret) = runsync($async, "-Tj", "1-initial.log");
|
my ($xc, $ret) = runsync($async, "-Tj", "1-initial.log");
|
||||||
if ($xc || ckchan("near/.mbsyncstate.new", $tx)) {
|
if ($xc || ckchan("near/.mbsyncstate.new", $tx)) {
|
||||||
|
@ -761,7 +763,7 @@ sub test_impl($$$$)
|
||||||
|
|
||||||
my $njl = (@$nj - 1) * 2;
|
my $njl = (@$nj - 1) * 2;
|
||||||
for (my $l = 1; $l <= $njl; $l++) {
|
for (my $l = 1; $l <= $njl; $l++) {
|
||||||
mkchan($$sx[0], $$sx[1], $$sx[2]);
|
mkchan($sx);
|
||||||
|
|
||||||
my ($nxc, $nret) = runsync($async, "-Tj$l", "4-interrupt.log");
|
my ($nxc, $nret) = runsync($async, "-Tj$l", "4-interrupt.log");
|
||||||
if ($nxc != (100 + ($l & 1)) << 8) {
|
if ($nxc != (100 + ($l & 1)) << 8) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user