modeling-cvs

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv28706/tests

Modified Files:
      Tag: brch-0_9pre6-1-ModelMasons_base_generation_scheme
	test_generate_python_code.sh 
Log Message:
Some cleaning & beautification

Index: test_generate_python_code.sh
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/Attic/test_generate_python_code.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** test_generate_python_code.sh	20 May 2003 14:24:44 -0000	1.1.2.1
--- test_generate_python_code.sh	26 May 2003 14:51:55 -0000	1.1.2.2
***************
*** 1,13 ****
  #! /bin/sh
! 
  GENERATE=../scripts/mdl_generate_python_code.py 
  RMDIR='/bin/rm -rf'
  
  function test_AuthorBooks() {
!   ./test_EditingContext_Global.py > /dev/null 2>&1
  }
  
  function test_StoreEmployees() {
!   ./test_EditingContext_Global_Inheritance.py > /dev/null 2>&1
  }
  
--- 1,15 ----
  #! /bin/sh
! ## Tests mdl_generate_python_code.py
! ## See also xmlmodels/README.txt
  GENERATE=../scripts/mdl_generate_python_code.py 
  RMDIR='/bin/rm -rf'
+ PYTHON=/usr/local/bin/python
  
  function test_AuthorBooks() {
!   $PYTHON ./test_EditingContext_Global.py > /dev/null 2>&1
  }
  
  function test_StoreEmployees() {
!   $PYTHON ./test_EditingContext_Global_Inheritance.py > /dev/null 2>&1
  }
  
***************
*** 17,20 ****
--- 19,24 ----
  
  ##--------
+ ## You should not need to modify anything below this line
+ ##--------
  function check_success() {
    if [ $? -ne 0 ]; then
***************
*** 33,40 ****
  
  function generate() { 
!   $GENERATE $* > /dev/null 2>&1 
  }
  
! ## Save the original trestPackages directories
  cp -Rp testPackages/AuthorBooks testPackages/AuthorBooks.ori
  cp -Rp testPackages/StoreEmployees testPackages/StoreEmployees.ori
--- 37,44 ----
  
  function generate() { 
!   $PYTHON $GENERATE $* > /dev/null 2>&1 
  }
  
! ## Save the original testPackages directories
  cp -Rp testPackages/AuthorBooks testPackages/AuthorBooks.ori
  cp -Rp testPackages/StoreEmployees testPackages/StoreEmployees.ori
***************
*** 110,117 ****
  
  ## Restore original directories
! \rm -rf AuthorBooks
! \rm -rf StoreEmployees
  cp -Rp testPackages/AuthorBooks.ori testPackages/AuthorBooks && \
!  $RMDIR testPackages/AuthorBooks.ori
  cp -Rp testPackages/StoreEmployees.ori testPackages/StoreEmployees && \
!  $RMDIR testPackages/StoreEmployees.ori
--- 114,121 ----
  
  ## Restore original directories
! \rm -rf testPackages/AuthorBooks
! \rm -rf testPackages/StoreEmployees
  cp -Rp testPackages/AuthorBooks.ori testPackages/AuthorBooks && \
!   $RMDIR testPackages/AuthorBooks.ori
  cp -Rp testPackages/StoreEmployees.ori testPackages/StoreEmployees && \
!   $RMDIR testPackages/StoreEmployees.ori