rpc01: fix $TCbin and $TCtmp

PATCH Superseded Simon Xu 2 participants 12 messages Nov 6, 2013 – Dec 2, 2013 3 messages not in the archive

lore

Share & tools

lore

Simon Xu

author

2013-11-06 02:25 UTC #0 lore raw

PATCH 1/1 rpc01: fix $TCbin and $TCtmp

The values of TCbin and TCtmp should be swapped, and `rpc1' is in TCbin, not TCtmp.

Signed-off-by Simon Xu <[email protected]>

---
 testcases/network/rpc/basic_tests/rpc01/rpc01 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

testcases/network/rpc/basic_tests/rpc01/rpc01 +3 -3

index ef97a95..c16493c 100755
@@ -36,9 +36,9 @@
 $trace_logic
 this_file=${0##*/}
 TC=${TC:=rpc01}
-TCbin=${TCbin:=`pwd`}
+TCbin=${TCbin:=$LTPROOT/testcases/bin}
 TCdat=${TCdat:=$TCbin/datafiles}
-TCtmp=${TCtmp:=$LTPROOT/testcases/bin}
+TCtmp=${TCtmp:=`pwd`}
 NUMLOOPS=${NUMLOOPS:=3}
 RHOST=${RHOST:=`hostname`}
 CLEANUP=${CLEANUP:="ON"}

@@ -68,7 +68,7 @@ do_test()
     do
       for FILE in $DATAFILES
       do
-	$TCtmp/rpc1 -s $RHOST -f $TCdat/$FILE
+	$TCbin/rpc1 -s $RHOST -f $TCdat/$FILE
 	[ $? -eq 0 ] || end_testcase "Fail on using $FILE"
       done
       COUNT=`expr $COUNT + 1`

Signature · 13 lines

1.8.4.2


------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most 
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Simon Xu

author

2013-11-06 05:28 UTC #1 lore raw

PATCH v2 1/1 rpc01: fix $TCbin and $TCtmp and data file names

The values of TCbin and TCtmp should be swapped, and `rpc1' is in TCbin, not TCtmp. Also correct the file names 'file.1' and 'file.2' which do not exist.

Signed-off-by Simon Xu <[email protected]>

---
 testcases/network/rpc/basic_tests/rpc01/rpc01 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

testcases/network/rpc/basic_tests/rpc01/rpc01 +4 -4

index ef97a95..8594835 100755
@@ -36,13 +36,13 @@
 $trace_logic
 this_file=${0##*/}
 TC=${TC:=rpc01}
-TCbin=${TCbin:=`pwd`}
+TCbin=${TCbin:=$LTPROOT/testcases/bin}
 TCdat=${TCdat:=$TCbin/datafiles}
-TCtmp=${TCtmp:=$LTPROOT/testcases/bin}
+TCtmp=${TCtmp:=`pwd`}
 NUMLOOPS=${NUMLOOPS:=3}
 RHOST=${RHOST:=`hostname`}
 CLEANUP=${CLEANUP:="ON"}
-DATAFILES=${DATAFILES:="file.1 file.2"}
+DATAFILES=${DATAFILES:="bin.med bin.sm"}
 
 #=============================================================================
 # FUNCTION NAME:        do_test

@@ -68,7 +68,7 @@ do_test()
     do
       for FILE in $DATAFILES
       do
-	$TCtmp/rpc1 -s $RHOST -f $TCdat/$FILE
+	$TCbin/rpc1 -s $RHOST -f $TCdat/$FILE
 	[ $? -eq 0 ] || end_testcase "Fail on using $FILE"
       done
       COUNT=`expr $COUNT + 1`

Signature · 13 lines

1.8.4.2


------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most 
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

[email protected]

2013-11-07 16:25 UTC #2 lore raw

Re: [LTP] [PATCH V2] rpc01: fix $TCbin and $TCtmp and data file names

Hi!

Quoted 31 lines

The values of TCbin and TCtmp should be swapped, and `rpc1' is in TCbin, not TCtmp. Also correct the file names 'file.1' and 'file.2' which do not exist.

Signed-off-by Simon Xu <[email protected]>

---
 testcases/network/rpc/basic_tests/rpc01/rpc01 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

testcases/network/rpc/basic_tests/rpc01/rpc01 +3 -3

index ef97a95..8594835 100755
@@ -36,13 +36,13 @@
 $trace_logic
 this_file=${0##*/}
 TC=${TC:=rpc01}
-TCbin=${TCbin:=`pwd`}
+TCbin=${TCbin:=$LTPROOT/testcases/bin}
 TCdat=${TCdat:=$TCbin/datafiles}
-TCtmp=${TCtmp:=$LTPROOT/testcases/bin}
+TCtmp=${TCtmp:=`pwd`}
 NUMLOOPS=${NUMLOOPS:=3}
 RHOST=${RHOST:=`hostname`}
 CLEANUP=${CLEANUP:="ON"}
-DATAFILES=${DATAFILES:="file.1 file.2"}
+DATAFILES=${DATAFILES:="bin.med bin.sm"}
 
 #=============================================================================
 # FUNCTION NAME:        do_test

testcases/network/rpc/basic_tests/rpc01/rpc01 do_test() · line 71

Quoted 5 lines

testcases/network/rpc/basic_tests/rpc01/rpc01 +1 -1

@@ -68,7 +68,7 @@ do_test()
     do
       for FILE in $DATAFILES
       do
-	$TCtmp/rpc1 -s $RHOST -f $TCdat/$FILE
+	$TCbin/rpc1 -s $RHOST -f $TCdat/$FILE

The runltp script adds $LTPROOT/testcases/bin to path so you should reduce this only to rpc1 and it should work.

The runltp script also sets $TMPDIR as temporary directory.

Signature · 13 lines

Cyril Hrubis
[email protected]

------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most 
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

A message that is not in the archive (sent off-list or not yet received): [email protected]

[email protected]

2013-11-11 14:15 UTC #4 lore raw

Re: [LTP] [PATCH V2] rpc01: fix $TCbin and $TCtmp and data file names

Hi!

Quoted 39 lines

Quoted 39 lines
Quoted 31 lines
The values of TCbin and TCtmp should be swapped, and `rpc1' is in TCbin, not TCtmp. Also correct the file names 'file.1' and 'file.2' which do not exist.
Signed-off-by Simon Xu <[email protected]>
---
  testcases/network/rpc/basic_tests/rpc01/rpc01 | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
testcases/network/rpc/basic_tests/rpc01/rpc01 +3 -3
index ef97a95..8594835 100755
@@ -36,13 +36,13 @@
  $trace_logic
  this_file=${0##*/}
  TC=${TC:=rpc01}
-TCbin=${TCbin:=`pwd`}
+TCbin=${TCbin:=$LTPROOT/testcases/bin}
  TCdat=${TCdat:=$TCbin/datafiles}
-TCtmp=${TCtmp:=$LTPROOT/testcases/bin}
+TCtmp=${TCtmp:=`pwd`}
  NUMLOOPS=${NUMLOOPS:=3}
  RHOST=${RHOST:=`hostname`}
  CLEANUP=${CLEANUP:="ON"}
-DATAFILES=${DATAFILES:="file.1 file.2"}
+DATAFILES=${DATAFILES:="bin.med bin.sm"}
 
  #=============================================================================
  # FUNCTION NAME:        do_test
testcases/network/rpc/basic_tests/rpc01/rpc01 do_test() · line 71
Quoted 5 lines
testcases/network/rpc/basic_tests/rpc01/rpc01 +1 -1
@@ -68,7 +68,7 @@ do_test()
      do
        for FILE in $DATAFILES
        do
-	$TCtmp/rpc1 -s $RHOST -f $TCdat/$FILE
+	$TCbin/rpc1 -s $RHOST -f $TCdat/$FILE
The runltp script adds $LTPROOT/testcases/bin to path so you should reduce this only to rpc1 and it should work.

Quoted 4 lines

Quoted 1 line
The runltp script also sets $TMPDIR as temporary directory.
Yes this fix is only for rpc01. And it seems that rpc01 is not designed for runltp script, but for networktests.sh, which uses TCtmp and TCbin.

The test rpc01 is listed in runtest/rpc and runtest/stress.part3 files, i.e. it is possible to execute these tests by runltp script.

Moreover all the tests in LTP should follow the same arangement of temp directory, test binaries directory, etc.

Signature · 13 lines

Cyril Hrubis
[email protected]

------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most 
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Simon Xu

author

2013-11-19 06:15 UTC #5 lore raw

PATCH v4 1/1 rpc01: fix paths and add Makefile for datafiles

1) fix $TCbin
2) eliminate $TCtmp, use $TMPDIR instead
3) The files in datafiles dir are needed in the test but they are not installed. Create a Makefile in datafiles to install the files.

Signed-off-by Simon Xu <[email protected]>

---
 testcases/network/rpc/basic_tests/rpc01/Makefile   |  4 ++-
 .../rpc/basic_tests/rpc01/datafiles/Makefile       | 29 ++++++++++++++++++++++
 testcases/network/rpc/basic_tests/rpc01/rpc01      |  9 +++----
 3 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile

testcases/network/rpc/basic_tests/rpc01/Makefile +3 -1

index ba3fe0a..732d816 100644
@@ -29,4 +29,6 @@ CPPFLAGS		+= -Wno-error
 
 INSTALL_TARGETS		:= rpc01
 
-include $(top_srcdir)/include/mk/generic_leaf_target.mk
+SUBDIRS			:= datafiles
+
+include $(top_srcdir)/include/mk/generic_trunk_target.mk

testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile new file +29 -0

new file mode 100644
index 0000000..92370e6
@@ -0,0 +1,29 @@
+#
+#    network/rpc/basic_tests/rpc01/datafiles Makefile.
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#    Simon Xu <[email protected]> Nov 8 2013
+#
+
+top_srcdir		?= ../../../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_DIR		:= testcases/bin/datafiles
+
+INSTALL_TARGETS		:= file*
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk

testcases/network/rpc/basic_tests/rpc01/rpc01 +4 -5

index ef97a95..7eed86d 100755
@@ -36,9 +36,8 @@
 $trace_logic
 this_file=${0##*/}
 TC=${TC:=rpc01}
-TCbin=${TCbin:=`pwd`}
+TCbin=${TCbin:=$LTPROOT/testcases/bin}
 TCdat=${TCdat:=$TCbin/datafiles}
-TCtmp=${TCtmp:=$LTPROOT/testcases/bin}
 NUMLOOPS=${NUMLOOPS:=3}
 RHOST=${RHOST:=`hostname`}
 CLEANUP=${CLEANUP:="ON"}

@@ -68,7 +67,7 @@ do_test()
     do
       for FILE in $DATAFILES
       do
-	$TCtmp/rpc1 -s $RHOST -f $TCdat/$FILE
+	rpc1 -s $RHOST -f $TCdat/$FILE
 	[ $? -eq 0 ] || end_testcase "Fail on using $FILE"
       done
       COUNT=`expr $COUNT + 1`

@@ -90,9 +89,9 @@ do_cleanup()
     $trace_logic
 
     if [ "$CLEANUP" = "ON" ]; then
-	if [ -f $TCtmp/core ]; then
+	if [ -f $TMPDIR/core ]; then
 	   echo "Core file is saved in /tmp"
-	   mv $TCtmp/core /tmp
+	   mv $TMPDIR/core /tmp
 	fi
 
 	# Kill server

Signature · 13 lines

1.8.4.2


------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing 
conversations that shape the rapidly evolving mobile landscape. Sign up now. 
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Simon Xu

author

2013-11-25 13:39 UTC #6 lore raw

Re: [LTP] [PATCH V4] rpc01: fix paths and add Makefile for datafiles

Could anyone help to review?

Thanks
Simon

Quoted 86 lines · Simon Xu

1) fix $TCbin
2) eliminate $TCtmp, use $TMPDIR instead
3) The files in datafiles dir are needed in the test but they are not installed. Create a Makefile in datafiles to install the files.

Signed-off-by Simon Xu <[email protected]>

---
  testcases/network/rpc/basic_tests/rpc01/Makefile   |  4 ++-
  .../rpc/basic_tests/rpc01/datafiles/Makefile       | 29 ++++++++++++++++++++++
  testcases/network/rpc/basic_tests/rpc01/rpc01      |  9 +++----
  3 files changed, 36 insertions(+), 6 deletions(-)

create mode 100644 testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile

testcases/network/rpc/basic_tests/rpc01/Makefile +3 -1

index ba3fe0a..732d816 100644
@@ -29,4 +29,6 @@ CPPFLAGS		+= -Wno-error
 
  INSTALL_TARGETS		:= rpc01
 
-include $(top_srcdir)/include/mk/generic_leaf_target.mk
+SUBDIRS			:= datafiles
+
+include $(top_srcdir)/include/mk/generic_trunk_target.mk

testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile new file +29 -0

new file mode 100644
index 0000000..92370e6
@@ -0,0 +1,29 @@
+#
+#    network/rpc/basic_tests/rpc01/datafiles Makefile.
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#    Simon Xu <[email protected]> Nov 8 2013
+#
+
+top_srcdir		?= ../../../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_DIR		:= testcases/bin/datafiles
+
+INSTALL_TARGETS		:= file*
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk

testcases/network/rpc/basic_tests/rpc01/rpc01 +2 -3

index ef97a95..7eed86d 100755
@@ -36,9 +36,8 @@
  $trace_logic
  this_file=${0##*/}
  TC=${TC:=rpc01}
-TCbin=${TCbin:=`pwd`}
+TCbin=${TCbin:=$LTPROOT/testcases/bin}
  TCdat=${TCdat:=$TCbin/datafiles}
-TCtmp=${TCtmp:=$LTPROOT/testcases/bin}
  NUMLOOPS=${NUMLOOPS:=3}
  RHOST=${RHOST:=`hostname`}
  CLEANUP=${CLEANUP:="ON"}

@@ -68,7 +67,7 @@ do_test()
      do
        for FILE in $DATAFILES
        do
-	$TCtmp/rpc1 -s $RHOST -f $TCdat/$FILE
+	rpc1 -s $RHOST -f $TCdat/$FILE
  	[ $? -eq 0 ] || end_testcase "Fail on using $FILE"
        done
        COUNT=`expr $COUNT + 1`

@@ -90,9 +89,9 @@ do_cleanup()
      $trace_logic

testcases/network/rpc/basic_tests/rpc01/rpc01 do_cleanup() · line 97

Quoted 10 lines

testcases/network/rpc/basic_tests/rpc01/rpc01 +2 -2

 
      if [ "$CLEANUP" = "ON" ]; then
-	if [ -f $TCtmp/core ]; then
+	if [ -f $TMPDIR/core ]; then
  	   echo "Core file is saved in /tmp"
-	   mv $TCtmp/core /tmp
+	   mv $TMPDIR/core /tmp
  	fi
 
  	# Kill server

------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation. Intel(R) Software Adrenaline delivers strategic insight and game-changing conversations that shape the rapidly evolving mobile landscape. Sign up now.
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

[email protected]

2013-11-26 14:50 UTC #7 lore raw

Re: [LTP] [PATCH V4] rpc01: fix paths and add Makefile for datafiles

In reply to Simon Xu

Hi!

Quoted 22 lines

testcases/network/rpc/basic_tests/rpc01/Makefile +1 -0

+include $(top_srcdir)/include/mk/generic_trunk_target.mk

testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile new file +15 -0

new file mode 100644
index 0000000..92370e6
@@ -0,0 +1,29 @@
+#
+#    network/rpc/basic_tests/rpc01/datafiles Makefile.
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,

testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile line 25

Quoted 10 lines

testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile new file +10 -0

+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#    Simon Xu <[email protected]> Nov 8 2013
+#
+
+top_srcdir		?= ../../../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_DIR		:= testcases/bin/datafiles

We allready have a testcases/data/ directory that is used by the unzip testcase, what about using this one instead?

testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile line 27

Quoted 1 line

testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile new file +1 -0
+INSTALL_TARGETS		:= file*

Can you please also rename the data files so that it's clear that they are part of the rpc test? Something like rpc01_file1 rpc01_file2 or similar should do. Or we can start stacking the files into subdirectories named after the testcase, i.e. testcases/data/rpc01/file1

Signature · 13 lines

Cyril Hrubis
[email protected]

------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing 
conversations that shape the rapidly evolving mobile landscape. Sign up now. 
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

A message that is not in the archive (sent off-list or not yet received): [email protected]

[email protected]

2013-11-27 11:49 UTC #9 lore raw

Re: [LTP] [PATCH V4] rpc01: fix paths and add Makefile for datafiles

Hi!

Quoted 18 lines

testcases/bin/datafiles is used by several tests
~/devel/ltp/testcases/network > grep -r datafiles *
Makefile:DIR := datafiles
nfs/nfslock01/nfslock01:# datafiles are compared.
nfs/nfs02/nfs02:TCdat=${TCdat:=$TCbin/datafiles} rpc/basic_tests/rpc01/rpc01:TCdat=${TCdat:=$TCbin/datafiles}
tcp_cmds/ftp/ftp01: TCdat=${TCdat:-$LTPROOT/datafiles}
tcp_cmds/Makefile:INSTALL_DEPS := ../datafiles/bin.sm
tcp_cmds/Makefile:../datafiles/bin.sm:
tcp_cmds/rcp/rcp01: TCdat=${TCdat:-$LTPROOT/testcases/bin/datafiles}
tcp_cmds/Makefile.inc:# network/tcp_cmds datafiles dependent include
Makefile.
tcp_cmds/Makefile.inc:MAKE_DEPS :=
$(GENERATE_FILE_DIR)/datafiles/bin.sm tcp_cmds/rdist/rdist01: TCdat=${TCdat:-$LTPROOT/testcases/bin/datafiles} tcp_cmds/sendfile/sendfile01:
TCdat=${TCdat:-$LTPROOT/testcases/bin/datafiles}

Ah, I guess there are at least two more places where tests install their data files. I've looked around and found a few in testcases/bin/ :(

Quoted 1 line

I think we better change all of them or do nothing.

Right. I want to have one single place to store test datafiles and ideally to be easy to figure out which files belogs to which testcases. Once this is defined we can fix all the testcases as well.

What about this:

1. Testcases datafiles are stored in a TESTNAME_data directory where TESTNAME is name of the test or a group of test (if the files are used by more than one test)

2. The whole directory gets installed somewhere in the /opt/ltp/testcases/, be it testcases/bin/datafiles or testcases/datafiles.

What do you think?

Signature · 13 lines

Cyril Hrubis
[email protected]

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

A message that is not in the archive (sent off-list or not yet received): [email protected]

Simon Xu

author

2013-11-28 10:10 UTC #11 lore raw

PATCH v5 1/1 rpc01: fix paths and add Makefile for datafiles

Signed-off-by Simon Xu <[email protected]>

---
 testcases/network/rpc/basic_tests/rpc01/Makefile   |  4 ++-
 .../rpc/basic_tests/rpc01/datafiles/Makefile       | 29 ++++++++++++++++++++++
 testcases/network/rpc/basic_tests/rpc01/rpc01      | 11 ++++----
 3 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile

testcases/network/rpc/basic_tests/rpc01/Makefile +3 -1

index ba3fe0a..732d816 100644
@@ -29,4 +29,6 @@ CPPFLAGS		+= -Wno-error
 
 INSTALL_TARGETS		:= rpc01
 
-include $(top_srcdir)/include/mk/generic_leaf_target.mk
+SUBDIRS			:= datafiles
+
+include $(top_srcdir)/include/mk/generic_trunk_target.mk

testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile new file +29 -0

new file mode 100644
index 0000000..7be4942
@@ -0,0 +1,29 @@
+#
+#    network/rpc/basic_tests/rpc01/datafiles Makefile.
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#    Simon Xu <[email protected]> Nov 8 2013
+#
+
+top_srcdir		?= ../../../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_DIR		:= testcases/data/rpc01
+
+INSTALL_TARGETS		:= file*
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk

testcases/network/rpc/basic_tests/rpc01/rpc01 +5 -6

index fd236b1..8ed69b0 100755
@@ -36,9 +36,8 @@
 $trace_logic
 this_file=${0##*/}
 TC=${TC:=rpc01}
-TCbin=${TCbin:=`pwd`}
-TCdat=${TCdat:=$TCbin/datafiles}
-TCtmp=${TCtmp:=$LTPROOT/testcases/bin}
+TCbin=${TCbin:=$LTPROOT/testcases/bin}
+TCdat=${TCdat:=$LTPROOT/testcases/data/rpc01}
 NUMLOOPS=${NUMLOOPS:=3}
 RHOST=${RHOST:=`hostname`}
 CLEANUP=${CLEANUP:="ON"}

@@ -71,7 +70,7 @@ do_test()
     do
       for FILE in $DATAFILES
       do
-	$TCtmp/rpc1 -s $RHOST -f $TCdat/$FILE
+	rpc1 -s $RHOST -f $TCdat/$FILE
 	[ $? -eq 0 ] || end_testcase "Fail on using $FILE"
       done
       COUNT=`expr $COUNT + 1`

@@ -93,9 +92,9 @@ do_cleanup()
     $trace_logic
 
     if [ "$CLEANUP" = "ON" ]; then
-	if [ -f $TCtmp/core ]; then
+	if [ -f $TMPDIR/core ]; then
 	   echo "Core file is saved in /tmp"
-	   mv $TCtmp/core /tmp
+	   mv $TMPDIR/core /tmp
 	fi
 
 	# Kill server

Signature · 13 lines

1.8.4.2


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

[email protected]

2013-12-02 17:59 UTC #12 lore raw

Re: [LTP] [PATCH V5] rpc01: fix paths and add Makefile for datafiles

Hi!

Quoted 7 lines

Signed-off-by Simon Xu <[email protected]>

---
 testcases/network/rpc/basic_tests/rpc01/Makefile   |  4 ++-
 .../rpc/basic_tests/rpc01/datafiles/Makefile       | 29 ++++++++++++++++++++++
 testcases/network/rpc/basic_tests/rpc01/rpc01      | 11 ++++----
 3 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile

Pushed, thanks.

Signature · 13 lines

Cyril Hrubis
[email protected]

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

[email protected]

2013-11-28 10:21 UTC #13 lore raw

Re: [LTP] [PATCH V4] rpc01: fix paths and add Makefile for datafiles

In reply to a message not in the archive

Hi!

Quoted 14 lines

Quoted 14 lines
Ah, I guess there are at least two more places where tests install their data files. I've looked around and found a few in testcases/bin/ :(
Quoted 1 line
I think we better change all of them or do nothing.
Right. I want to have one single place to store test datafiles and ideally to be easy to figure out which files belogs to which testcases. Once this is defined we can fix all the testcases as well.
What about this:
1. Testcases datafiles are stored in a TESTNAME_data directory where TESTNAME is name of the test or a group of test (if the files are used by more than one test)

Quoted 7 lines

Quoted 5 lines
2. The whole directory gets installed somewhere in the /opt/ltp/testcases/, be it testcases/bin/datafiles or testcases/datafiles.
What do you think?
What about testcases/data/TESTNAME?

OK with me.

Signature · 13 lines

Cyril Hrubis
[email protected]

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Simon Xu

author

2013-11-08 06:48 UTC #14 lore raw

PATCH v3 1/1 rpc01: fix $TCbin and $TCtmp and add Makefile for datafiles

In reply to Simon Xu

1) The values of TCbin and TCtmp should be swapped, and `rpc1' is in TCbin, not TCtmp.
2) The files in datafiles dir are needed in the test but they are not installed. Create a Makefile in datafiles to install the files.

Signed-off-by Simon Xu <[email protected]>

---
 testcases/network/rpc/basic_tests/rpc01/Makefile   |  4 ++-
 .../rpc/basic_tests/rpc01/datafiles/Makefile       | 29 ++++++++++++++++++++++
 testcases/network/rpc/basic_tests/rpc01/rpc01      |  6 ++---
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile

testcases/network/rpc/basic_tests/rpc01/Makefile +3 -1

index ba3fe0a..732d816 100644
@@ -29,4 +29,6 @@ CPPFLAGS		+= -Wno-error
 
 INSTALL_TARGETS		:= rpc01
 
-include $(top_srcdir)/include/mk/generic_leaf_target.mk
+SUBDIRS			:= datafiles
+
+include $(top_srcdir)/include/mk/generic_trunk_target.mk

testcases/network/rpc/basic_tests/rpc01/datafiles/Makefile new file +29 -0

new file mode 100644
index 0000000..92370e6
@@ -0,0 +1,29 @@
+#
+#    network/rpc/basic_tests/rpc01/datafiles Makefile.
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#    Simon Xu <[email protected]> Nov 8 2013
+#
+
+top_srcdir		?= ../../../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_DIR		:= testcases/bin/datafiles
+
+INSTALL_TARGETS		:= file*
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk

testcases/network/rpc/basic_tests/rpc01/rpc01 +3 -3

index ef97a95..c16493c 100755
@@ -36,9 +36,9 @@
 $trace_logic
 this_file=${0##*/}
 TC=${TC:=rpc01}
-TCbin=${TCbin:=`pwd`}
+TCbin=${TCbin:=$LTPROOT/testcases/bin}
 TCdat=${TCdat:=$TCbin/datafiles}
-TCtmp=${TCtmp:=$LTPROOT/testcases/bin}
+TCtmp=${TCtmp:=`pwd`}
 NUMLOOPS=${NUMLOOPS:=3}
 RHOST=${RHOST:=`hostname`}
 CLEANUP=${CLEANUP:="ON"}

@@ -68,7 +68,7 @@ do_test()
     do
       for FILE in $DATAFILES
       do
-	$TCtmp/rpc1 -s $RHOST -f $TCdat/$FILE
+	$TCbin/rpc1 -s $RHOST -f $TCdat/$FILE
 	[ $? -eq 0 ] || end_testcase "Fail on using $FILE"
       done
       COUNT=`expr $COUNT + 1`

Signature · 13 lines

1.8.4.2


------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most 
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list