diff options
| author | Dan Gudmundsson <[email protected]> | 2019-08-09 12:52:59 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2019-08-09 12:52:59 +0200 |
| commit | d48dd93bee87d039b80553031e7fe6625feff908 (patch) | |
| tree | 87a837c49ef8255c0df11a0d811f6166d6b0d030 /lib/mnesia/test/mt | |
| parent | 29a73cf252143a09457a22dca433c4486d1c497b (diff) | |
| parent | 7e92eb6666f3d73eb683516bc4b74b827953ec4a (diff) | |
| download | otp-d48dd93bee87d039b80553031e7fe6625feff908.tar.gz otp-d48dd93bee87d039b80553031e7fe6625feff908.tar.bz2 otp-d48dd93bee87d039b80553031e7fe6625feff908.zip | |
Merge branch 'dgud/mnesia/sticky-bug/ERL-768/OTP-15979' into maint
* dgud/mnesia/sticky-bug/ERL-768/OTP-15979:
mnesia: Bump protocol version
mnesia: Introduce sync_asym_trans protocol
Diffstat (limited to 'lib/mnesia/test/mt')
| -rwxr-xr-x | lib/mnesia/test/mt | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/lib/mnesia/test/mt b/lib/mnesia/test/mt index a398ee0422..b169734f56 100755 --- a/lib/mnesia/test/mt +++ b/lib/mnesia/test/mt @@ -34,8 +34,35 @@ erlcmd="erl -sname a $p $args -mnesia_test_timeout" erlcmd1="erl -sname a1 $p $args" erlcmd2="erl -sname a2 $p $args" -xterm -geometry 70x20+0+550 -T a1 -e $erlcmd1 & -xterm -geometry 70x20+450+550 -T a2 -e $erlcmd2 & +if test z"$MT_TERM" = z ; then + MT_TERM=xterm +fi + +case $MT_TERM in + xterm) + geom0="-geometry 142x40+0+0" + geom1="-geometry 70x20+0+550" + geom2="-geometry 70x20+480+550" + title="-T" + exec="-e" + ;; + gnome-terminal) + geom0="--geometry 142x40+0+0" + geom1="--geometry 70x20+0+740" + geom2="--geometry 70x20+700+740" + title="--title" + exec="--hide-menubar --" + ;; + *rxvt) + geom0="-geometry 142x40+0+0" + geom1="-geometry 70x20+0+680" + geom2="-geometry 70x20+630+680" + title="-title" + exec="-e" +esac + +$MT_TERM $geom1 $title a1 $exec $erlcmd1 & +$MT_TERM $geom2 $title a2 $exec $erlcmd2 & rm "$latest" 2>/dev/null ln -s "$log" "$latest" @@ -51,11 +78,6 @@ echo "Give the following command in order to see the outcome from node a@$h"":" echo "" echo " less test_log$$" -ostype=`uname -s` -if [ "$ostype" = "SunOS" ] ; then - /usr/openwin/bin/xterm -geometry 145x40+0+0 -T a -l -lf "$log" -e $erlcmd & -else - xterm -geometry 145x40+0+0 -T a -e script -f -c "$erlcmd" "$log" & -fi +$MT_TERM $geom0 $title a $exec script -f -c "$erlcmd" "$log" & tail -f "$log" | egrep 'Eval|<>ERROR|NYI' |