Changeset d12294e in git


Ignore:
Timestamp:
20/09/11 08:12:54 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
svn/1.0, svn/tags/1.0.40
Children:
a2d293b
Parents:
e6305f3
Message:

Backport change from 1.2.0:
tests/: Most tests weren't actually running and testcases (looks like
a sh portability issue). Fixed, and fortunately all tests still
pass.
tests/extend.tst: Fix to file .espec files when srcdir != builddir.

git-svn-id: file:///home/survex-svn/survex/branches/1.0@3686 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    re6305f3 rd12294e  
     1Tue Sep 20 07:11:37 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * Backport change from 1.2.0:
     4        * tests/: Most tests weren't actually running and testcases (looks like
     5          a sh portability issue).  Fixed, and fortunately all tests still
     6          pass.
     7        * tests/extend.tst: Fix to file .espec files when srcdir != builddir.
     8
    19Tue Sep 20 06:59:39 GMT 2011  Olly Betts <olly@survex.com>
    210
  • tests/3dtopos.tst

    re6305f3 rd12294e  
    22#
    33# Survex test suite - 3dtopos tests
    4 # Copyright (C) 1999-2003,2005 Olly Betts
     4# Copyright (C) 1999-2003,2005,2010 Olly Betts
    55#
    66# This program is free software; you can redistribute it and/or modify
     
    3131: ${TDTOPOS="$testdir"/../src/3dtopos}
    3232
    33 : ${TESTS=${*-"pos.pos v0 v0b v1 v2 v3"}}
     33: ${TESTS=${*:-"pos.pos v0 v0b v1 v2 v3"}}
    3434
    3535for file in $TESTS ; do
  • tests/cavern.tst

    re6305f3 rd12294e  
    22#
    33# Survex test suite - cavern tests
    4 # Copyright (C) 1999-2004,2005 Olly Betts
     4# Copyright (C) 1999-2004,2005,2010 Olly Betts
    55#
    66# This program is free software; you can redistribute it and/or modify
     
    1616# You should have received a copy of the GNU General Public License
    1717# along with this program; if not, write to the Free Software
    18 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
     18# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
    1919
    2020testdir=`echo $0 | sed 's!/[^/]*$!!' || echo '.'`
     
    3232: ${CAD3D="$testdir"/../src/cad3d}
    3333
    34 : ${TESTS=${*-"singlefix singlereffix oneleg midpoint noose cross firststn\
     34: ${TESTS=${*:-"singlefix singlereffix oneleg midpoint noose cross firststn\
    3535 deltastar deltastar2 bug3 calibrate_tape nosurvey2 cartesian cartesian2\
    3636 lengthunits angleunits cmd_truncate cmd_case cmd_fix cmd_solve\
  • tests/diffpos.tst

    re6305f3 rd12294e  
    22#
    33# Survex test suite - diffpos tests
    4 # Copyright (C) 1999-2003 Olly Betts
     4# Copyright (C) 1999-2003,2010 Olly Betts
    55#
    66# This program is free software; you can redistribute it and/or modify
     
    3030: ${DIFFPOS="$testdir"/../src/diffpos}
    3131
    32 : ${TESTS=${*-"delatend addatend"}}
     32: ${TESTS=${*:-"delatend addatend"}}
    3333
    3434for file in $TESTS ; do
  • tests/extend.tst

    re6305f3 rd12294e  
    22#
    33# Survex test suite - extend tests
    4 # Copyright (C) 1999-2003 Olly Betts
     4# Copyright (C) 1999-2003,2010 Olly Betts
    55#
    66# This program is free software; you can redistribute it and/or modify
     
    3232: ${DIFFPOS="$testdir"/../src/diffpos}
    3333
    34 : ${TESTS=${*-"extend extend2names eswap"}} # also eswap-break
     34: ${TESTS=${*:-"extend extend2names eswap"}} # also eswap-break
    3535# JPNP: eswap-break currently fails due to bug in diffpos
    3636
     
    3838  echo $file
    3939  EXTEND_ARGS=""
    40   test -f "$file.espec" && EXTEND_ARGS="--specfile $file.espec"
     40  test -f "$srcdir/$file.espec" && EXTEND_ARGS="--specfile $srcdir/$file.espec"
    4141  rm -f tmp.*
    4242  if test -n "$VERBOSE" ; then
Note: See TracChangeset for help on using the changeset viewer.