blautenb 2004/03/06 19:20:08
Modified: c/src basicTests.pl Log: Add option to source windows executables from VC7 build directories Revision Changes Path 1.8 +21 -56 xml-security/c/src/basicTests.pl Index: basicTests.pl =================================================================== RCS file: /home/cvs/xml-security/c/src/basicTests.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- basicTests.pl 16 Feb 2004 11:30:01 -0000 1.7 +++ basicTests.pl 7 Mar 2004 03:20:08 -0000 1.8 @@ -1,60 +1,21 @@ +# Copyright 2002-2004 The Apache Software Foundation. # -# The Apache Software License, Version 1.1 +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# imitations under the License. + +# All these setting come from the configure script +# We use configure to do most of the hard work as it is more +# designed to handle different system complexity than make # -# -# Copyright (c) 1999 The Apache Software Foundation. All rights -# reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# -# 3. The end-user documentation included with the redistribution, -# if any, must include the following acknowledgment: -# "This product includes software developed by the -# Apache Software Foundation (http://www.apache.org/)." -# Alternately, this acknowledgment may appear in the software itself, -# if and wherever such third-party acknowledgments normally appear. -# -# 4. The names "<WebSig>" and "Apache Software Foundation" must -# not be used to endorse or promote products derived from this -# software without prior written permission. For written -# permission, please contact [EMAIL PROTECTED] -# -# 5. Products derived from this software may not be called "Apache", -# nor may "Apache" appear in their name, without prior written -# permission of the Apache Software Foundation. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR -# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ==================================================================== -# -# This software consists of voluntary contributions made by many -# individuals on behalf of the Apache Software Foundation and was -# originally based on software copyright (c) 2001, Institute for -# Data Communications Systems, <http://www.nue.et-inf.uni-siegen.de/>. -# The development of this software was partly funded by the European -# Commission in the <WebSig> project in the ISIS Programme. -# For more information on the Apache Software Foundation, please see -# <http://www.apache.org/>. # A perl based test script for running all the interop examples @@ -93,6 +54,9 @@ my $checksig; my $cipher; +my $checksig_vc7 = "../Build/Win32/VC7/Debug/checksig.exe"; +my $cipher_vc7 = "../Build/Win32/VC7/Debug/cipher.exe"; + if ($^O =~ m/Win/) { $checksig = "../Build/Win32/VC6/Debug/checksig.exe"; $cipher = "../Build/Win32/VC6/Debug/cipher.exe"; @@ -284,7 +248,7 @@ sub print_args { - print STDERR "\nUsage: basicTests.pl [--noxalan] [--nopothole] [--noaes]\n\n"; + print STDERR "\nUsage: basicTests.pl [--noxalan] [--nopothole] [--noaes] [--vc7]\n\n"; exit(1); } @@ -297,6 +261,7 @@ if (/^--noxalan$/ || /^-x$/) {$have_xalan = 0; last SWITCH;} if (/^--nopothole$/ || /^-p$/) {$have_pothole = 0; last SWITCH;} if (/^--noaes$/ || /^-a$/) {$have_aes = 0; last SWITCH;} + if (/^--vc7$/) {$checksig = $checksig_vc7 ; $cipher = $cipher_vc7; last SWITCH;} if (/^--nosig$/) {$dosig = 0; last SWITCH;} if (/^--noenc$/) {$doenc = 0; last SWITCH;} print STDERR "Unknown command : " . $_ . "\n\n";
