Change all uses of tbswapin/tbswapout to tbswap in|out.

testsuite/templates/frontend

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/templates/full

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/basic/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/basic_rsrv/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/buddycache/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/cbr/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/complete5/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/db1/test

@@ -29,8 +29,8 @@ tb_compare("SELECT vname,delay,bandwidth,lossrate,member from virt_lans" .
 tb_compare("SELECT ips,vname,type from virt_nodes" .
     " where pid=\"testbed\" and eid=\"test\"",
     \@result);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/delaylan1/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/delaylink/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/dnardshelf/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/fixed/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/lan1/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/mini_multilink/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/mini_nodes/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/mini_set-ip/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/mini_tbcmd/test

@@ -24,8 +24,8 @@ tb_compare("select ips,vname,type from virt_nodes" .
 tb_compare("select  ips,osid,cmd_line,rpms,deltas,startupcmd,tarfiles,failureaction,type" .
     " from virt_nodes where pid=\"testbed\" and eid=\"test\"" .
     " and vname=\"node4\"",\@result);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/multilink/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/nodes/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);

testsuite/tests/ping/test

 tb_prerun("tbprerun",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
-tb_run("tbswapin",0);
-tb_run("tbswapout",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
+tb_run("tbswap in",0);
+tb_run("tbswap out",0);
 tb_run("tbend",0);