Do some cleanup for tst_brkloop

Signed-off-by Bian Naimeng <[email protected]>

---
 tools/apicmds/ltpapicmd.c |   36 ------------------------------------
 1 files changed, 0 insertions(+), 36 deletions(-)

tools/apicmds/ltpapicmd.c +0 -36

index 78284a9..9c66ba3 100644
@@ -236,25 +236,6 @@ int main( int argc,
         tst_res(trestype, file_name, arg_fmt);
     }
     else
-    if (strcmp((char *)cmd_name, "tst_brkloop") == 0)
-    {
-        if (argc < 5)
-        {
-            fprintf(stderr, "Usage: %s TTYPE FNAME FUNC STRING\n"
-            "\tTTYPE  - Test Result Type; one of TFAIL, TBROK, TCONF, "
-            "and TRETR.\n"
-            "\tFNAME  - Print contents of this file after the message\n"
-            "\tFUNC   - Cleanup function (ignored), but MUST be provided\n"
-            "\tSTRING - Message explaining the test result\n", cmd_name);
-            exit (-1);
-        }
-        trestype = ident_ttype(argv++[0]);
-        file_name = argv++[0];
-        argv++;
-        strcpy(arg_fmt, *argv);
-        tst_brkloop(trestype, file_name, cleanup, arg_fmt);
-    }
-    else
     if (strcmp((char *)cmd_name, "tst_brkm") == 0)
     {
         if (argc < 4)

@@ -287,23 +268,6 @@ int main( int argc,
         tst_resm(trestype, arg_fmt);
     }
     else
-    if (strcmp((char *)cmd_name, "tst_brkloopm") == 0)
-    {
-        if (argc < 4)
-        {
-            fprintf(stderr, "Usage: %s TTYPE FUNC STRING\n"
-            "\tTTYPE  - Test Result Type; one of TFAIL, TBROK, TCONF, "
-            "and TRETR.\n"
-            "\tFUNC   - Cleanup function (ignored), but MUST be provided\n"
-            "\tSTRING - Message explaining the test result\n", cmd_name);
-            exit (-1);
-        }
-        trestype = ident_ttype(argv++[0]);
-        argv++;
-        strcpy(arg_fmt, *argv);
-        tst_brkloopm(trestype, cleanup, arg_fmt);
-    }
-    else
     if (strcmp((char *)cmd_name, "tst_exit") == 0)
         tst_exit();
     else

Signature · 21 lines

1.7.0.4





-- 
Regards
Bian Naimeng


------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

*facepalm* git and I really don't get along. I tried to merge the change from ltp-broom, that pulled in a bunch of stuff I didn't want, reset via reset --hard, then checked out the one file from ltp-broom, which worked, and when I pushed everything -- it pushed all of my changes from ltp-broom back to master. So I suppose the question now is to continue with things as-is, or revert the commit. I'm guessing folks will want the latter, but I'm unfamiliar enough with merging and reverting with git because it's user friendliness that I'm concerned about doing more harm than good trying to fix things.

I need to go back home (where I don't have internet via my laptop right now and won't for the next couple of days), but I'll continue to work on verifying everything and fix regressions if and when I find them, and I'll try to pop over to work whenever possible to push code back to the git repo.