[LTP] [PATCH]Do some cleanup for tst_brkloop

[LTP] [PATCH]Do some cleanup for tst_brkloop

[Bian Naimeng]

Commit 8798ebf need more cleanup.

Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>

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

diff --git a/tools/apicmds/ltpapicmd.c b/tools/apicmds/ltpapicmd.c
index 78284a9..9c66ba3 100644
--- a/tools/apicmds/ltpapicmd.c
+++ b/tools/apicmds/ltpapicmd.c
@@ -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
-- 
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
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH]Do some cleanup for tst_brkloop

[Cyril Hrubis]

Hi!
> Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>

Missed this one (I've send similar patch just some minutes ago).

Acked-by: Cyril Hrubis <chrubis@suse.cz>

> ---
>  tools/apicmds/ltpapicmd.c |   36 ------------------------------------
>  1 files changed, 0 insertions(+), 36 deletions(-)
> 
> diff --git a/tools/apicmds/ltpapicmd.c b/tools/apicmds/ltpapicmd.c
> index 78284a9..9c66ba3 100644
> --- a/tools/apicmds/ltpapicmd.c
> +++ b/tools/apicmds/ltpapicmd.c
> @@ -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
> -- 
> 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
> Ltp-list@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/ltp-list

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
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
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH]Do some cleanup for tst_brkloop

[Cyril Hrubis]

Hi!
> 	*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.

Just now we need to get git to some sane state so that patches created
against latest git could be merged later. But I'm not sure if reseting
back is better than fixing the problems created by merge. If all the
problems are created by merging files that were changed in both master
and ltp-broom then IMHO fixing these would be better way to go.

FYI: just now compilation dies with:

gcc   -L../../../../lib  test_arch.o   -o test_arch_debug
test_arch.o: In function `main':
/home/metan/Work/git/ltp-dev/testcases/commands/ade/objdump/test_arch.c:17:
undefined reference to `tst_exit'
collect2: ld returned 1 exit status
make[4]: *** [test_arch_debug] Error 1
make[4]: Leaving directory
`/home/metan/Work/git/ltp-dev/testcases/commands/ade/objdump'
make[3]: *** [all] Error 2
make[3]: Leaving directory
`/home/metan/Work/git/ltp-dev/testcases/commands/ade'
make[2]: *** [all] Error 2
make[2]: Leaving directory
`/home/metan/Work/git/ltp-dev/testcases/commands'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/metan/Work/git/ltp-dev/testcases'
make: *** [testcases-all] Error 2

> 	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.

I hope that lack of the internet connection in your home is only
temporary, as so far you did the commits and there is a already some
backlog of waiting patches. I know that it's holidays now but I'm
allready starting to lose track of the issues waiting for commit.

If you need some help with that, don't hesitate to ask.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
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
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list