From: David B. <ad...@us...> - 2006-08-30 21:13:44
|
Update of /cvsroot/octave/octave-forge/admin In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13120/admin Modified Files: mktests.sh run_forge Log Message: packages, packages, packages Index: mktests.sh =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/mktests.sh,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- mktests.sh 7 Apr 2006 13:17:33 -0000 1.10 +++ mktests.sh 30 Aug 2006 21:13:39 -0000 1.11 @@ -1,7 +1,7 @@ #! /bin/sh -# Where to find mkpkgadd -MKPKGADD=$1 +# Root of the search +root=`pwd` # Create a new fntests.m file echo "fid=fopen('fntests.log','wt');" > fntests.m @@ -10,7 +10,7 @@ echo "passes=0; tests=0;" >>fntests.m # Find all toplevel non-cvs directories -DIRS="`find FIXES main/* extra/* nonfree/* -type d ! -name CVS -prune`" +DIRS="`find $* -type d ! -name CVS`" # Find the tests in that directory for dir in $DIRS; do @@ -19,22 +19,12 @@ # skip the NOINSTALL directories if test -f "$dir/NOINSTALL"; then continue; fi - # Create local copy of PKG_ADD for in place testing - if test -e "$dir/PKG_ADD" ; then rm -f $dir/PKG_ADD; fi - $MKPKGADD $dir > $dir/PKG_ADD - if test -z "`cat $dir/PKG_ADD`" ; then rm -f $dir/PKG_ADD; fi - # Build a list of possible test files FILES="" - # Find all successfully compiled .cc files + # Find all .cc files cxx_files=`echo $dir/*.cc` - if test "$cxx_files" != "$dir/*.cc"; then - for file in $cxx_files; do - obj=`echo "$file" | sed -e 's-\.cc$-.o-'` - if test -f "$obj" ; then FILES="$FILES $file"; fi - done - fi + if test "$cxx_files" != "$dir/*.cc"; then FILES="$FILES $cxx_files"; fi # Find all m-files m_files=`echo $dir/*.m` @@ -58,7 +48,7 @@ else echo "dp=dn=0;" >>fntests.m for file in $TESTS ; do - echo "[p,n] = test('$file','quiet',fid);" >>fntests.m + echo "[p,n] = test('$root/$file','quiet',fid);" >>fntests.m echo "dp += p; dn += n;" >>fntests.m done echo "if dp==dn, printf('%-40s ---> success',''); else" >>fntests.m Index: run_forge =================================================================== RCS file: /cvsroot/octave/octave-forge/admin/run_forge,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- run_forge 23 Aug 2006 22:13:53 -0000 1.5 +++ run_forge 30 Aug 2006 21:13:40 -0000 1.6 @@ -17,14 +17,14 @@ BINPATH="$PATH" LDPATH="$LD_LIBRARY_PATH" DYLDPATH="$DYLD_LIBRARY_PATH" -OCTPATH="$OCTAVE_PATH" +OCTPATH="$OCTAVE_PATH:../" # XXX FIXME XXX strictly speaking, the default octave bin directories # should be in the middle of EXECPATH and PATH, but it should be safe # to put them at the end since octave probably isn't overriding anything # on the system. We may also want to pick up the OCTAVE_EXEC_PATH if # there is one. EXECPATH="$PATH:" -for f in install/* main/* extra/* nonfree/*; do +for f in code/* install/*; do # exclude CVS directories, only include directories, skip NOINSTALL case "$f" in */CVS) ;; @@ -32,6 +32,10 @@ if test -d $f -a ! -f $f/NOINSTALL; then OCTPATH="$ROOT/$f:$OCTPATH" + # if in a package source directory add inst/ src/ + if test -d "$f/inst"; then OCTPATH="$ROOT/$f/inst:$OCTPATH"; fi + if test -d "$f/src"; then OCTPATH="$ROOT/$f/src:$OCTPATH"; fi + # if there is install data, include in on the path if test -d "$f/data"; then OCTPATH="$ROOT/$f/data:$OCTPATH"; fi @@ -52,7 +56,7 @@ LD_LIBRARY_PATH="$LDPATH" DYLD_LIBRARY_PATH="$DYLDPATH" PATH="$BINPATH" -OCTAVE_PATH="$OCTPATH" +OCTAVE_LOADPATH="$OCTPATH" OCTAVE_EXEC_PATH="$EXECPATH" -export LD_LIBRARY_PATH DYLD_LIBRARY_PATH PATH OCTAVE_PATH OCTAVE_EXEC_PATH +export LD_LIBRARY_PATH DYLD_LIBRARY_PATH PATH OCTAVE_LOADPATH OCTAVE_EXEC_PATH $* |