[Nice-commit] tester run,1.12,1.13

[Daniel B. <bo...@us...>]

Update of /cvsroot/nice/tester
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27117

Modified Files:
	run 
Log Message:
Use short machine name.

USER seems not defined when running from cron, using whoami instead.

Push the creation of the test results page, instead of pulling it from SF.
Would need locking with more than one test machine.


Index: run
===================================================================
RCS file: /cvsroot/nice/tester/run,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** run	7 May 2004 09:01:02 -0000	1.12
--- run	25 Feb 2005 16:35:53 -0000	1.13
***************
*** 18,24 ****
  
  # Set up variables, that can be overriden in the setup file.
! machine="`hostname -f`"
  system="`uname -a`"
! user="$USER"
  
  export CVS_SOURCEFORGE="cvs.sourceforge.net"
--- 18,24 ----
  
  # Set up variables, that can be overriden in the setup file.
! machine="`hostname`"
  system="`uname -a`"
! user="`whoami`"
  
  export CVS_SOURCEFORGE="cvs.sourceforge.net"
***************
*** 49,53 ****
      name="`expr match $conffile '../config\.\(.*\)'`"
  
!     # Blamk the variable, so it does not keep the previous value if it
      # is not reset to a new value.
      JDK_VERSION=
--- 49,53 ----
      name="`expr match $conffile '../config\.\(.*\)'`"
  
!     # Blank the variable, so it does not keep the previous value if it
      # is not reset to a new value.
      JDK_VERSION=
***************
*** 121,127 ****
  else
    scp -p ./*.id ./*.res ./*.html $us...@sh...:$results_dir
  
    # If everything went OK, upload the new development version.
!   if [ $failed = false -a "$NICE_MASTER" ]; then
      scp Nice/share/java/nice.jar bo...@sh...:/home/groups/n/ni/nice/htdocs
  fi
--- 121,129 ----
  else
    scp -p ./*.id ./*.res ./*.html $us...@sh...:$results_dir
+   # update the results page
+   ssh $us...@sh... "sh -c 'cd $results_dir/.. && ./run'"
  
    # If everything went OK, upload the new development version.
!   if [ "$failed" = false -a "$NICE_MASTER" ]; then
      scp Nice/share/java/nice.jar bo...@sh...:/home/groups/n/ni/nice/htdocs
  fi