Rewrote runtest in Perl so that it can be used on the Windows side.
Added options for include directories, debug level and target platform. selection.
This commit is contained in:
Alexandre Julliard
parent
ebd225cbaf
commit
9384184a11
|
|
@ -61,6 +61,7 @@ ALLLINTFLAGS = $(LINTFLAGS) $(DEFS) $(OPTIONS) $(DIVINCL)
|
|||
WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi_check/winapi_check
|
||||
WINETEST = $(TOPOBJDIR)/programs/winetest/winetest
|
||||
RUNTEST = $(TOPSRCDIR)/programs/winetest/runtest
|
||||
RUNTESTFLAGS = -q -P wine -T $(TOPOBJDIR)
|
||||
TESTRESULTS = $(PLTESTS:.pl=.ok) $(CTESTS:.c=.ok)
|
||||
WINEBUILD = $(TOPOBJDIR)/tools/winebuild/winebuild
|
||||
MAKEDEP = $(TOPOBJDIR)/tools/makedep
|
||||
|
|
@ -127,7 +128,7 @@ LINTS = $(C_SRCS:.c=.ln)
|
|||
$(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 )
|
||||
|
||||
.pl.ok:
|
||||
$(RUNTEST) $(TOPOBJDIR) $< $(RUNTESTFLAGS) && touch $@
|
||||
$(RUNTEST) $(RUNTESTFLAGS) $< && touch $@
|
||||
|
||||
.PHONY: all install uninstall clean distclean depend dummy test testclean
|
||||
|
||||
|
|
|
|||
|
|
@ -198,6 +198,9 @@ print NEWMAKE sort @depends;
|
|||
print NEWMAKE <<EOF;
|
||||
# Misc rules
|
||||
|
||||
\$(SUBDIRS:%=%/__test__): dummy
|
||||
\@cd `dirname \$\@` && \$(MAKE) test
|
||||
|
||||
\$(SUBDIRS:%=%/__checklink__): dummy
|
||||
\@cd `dirname \$\@` && \$(MAKE) checklink
|
||||
|
||||
|
|
@ -208,6 +211,8 @@ install:: \$(SUBDIRS:%=%/__install__)
|
|||
|
||||
uninstall:: \$(SUBDIRS:%=%/__uninstall__)
|
||||
|
||||
test:: \$(SUBDIRS:%=%/__test__)
|
||||
|
||||
checklink:: \$(SUBDIRS:%=%/__checklink__)
|
||||
|
||||
debug_channels:: \$(SUBDIRS:%=%/__debug_channels__)
|
||||
|
|
|
|||
|
|
@ -1,34 +1,97 @@
|
|||
#!/bin/sh
|
||||
#!/usr/bin/perl
|
||||
#
|
||||
# Wrapper script to run tests from inside the Wine tree
|
||||
#
|
||||
# Usage: runtest $TOPOBJDIR input_file [flags...]
|
||||
# Usage: runtest [options] input_file [perl_args...]
|
||||
#
|
||||
usage()
|
||||
|
||||
sub usage
|
||||
{
|
||||
echo "Usage: $0 \$TOPOBJDIR input_file [flags]"
|
||||
exit 1
|
||||
print STDERR <<EOF;
|
||||
|
||||
Usage: $0 [options] input_file [perl_args...]
|
||||
|
||||
Options:
|
||||
-q quiet mode
|
||||
-v verbose mode (can be specified multiple times)
|
||||
-I dir prepend dir to Perl include path
|
||||
-P name set the current platform name
|
||||
-T dir set Wine tree top directory (autodetected if not specified)
|
||||
|
||||
EOF
|
||||
exit 1;
|
||||
}
|
||||
|
||||
if [ $# -lt 2 ]
|
||||
then
|
||||
usage
|
||||
fi
|
||||
# default values
|
||||
$platform = $ENV{WINETEST_PLATFORM};
|
||||
$ENV{WINETEST_DEBUG} ||= 1;
|
||||
|
||||
if [ -d "$1" ]
|
||||
then
|
||||
topobjdir=`cd "$1" && pwd`
|
||||
# parse command-line options
|
||||
while ($#ARGV >= 0)
|
||||
{
|
||||
$arg = shift @ARGV;
|
||||
if ($arg eq "-h") { usage; }
|
||||
if ($arg eq "-q") { $ENV{WINETEST_DEBUG} = 0; next; }
|
||||
if ($arg eq "-v") { $ENV{WINETEST_DEBUG}++; next; }
|
||||
if ($arg eq "-I") { $ENV{WINETEST_DEBUG} = 0; next; }
|
||||
if ($arg eq "-P") { $platform = shift @ARGV; next; }
|
||||
if ($arg eq "-I") { push @include_dirs, shift @ARGV; next; }
|
||||
if ($arg eq "-T")
|
||||
{
|
||||
$topobjdir = shift @ARGV;
|
||||
usage unless (-d $topobjdir);
|
||||
next;
|
||||
}
|
||||
$infile = $arg;
|
||||
last;
|
||||
}
|
||||
|
||||
# we must have found an input file
|
||||
usage unless defined($infile);
|
||||
|
||||
# check/detect topobjdir
|
||||
if (defined($topobjdir))
|
||||
{
|
||||
unless (-f $topobjdir . "/server/wineserver")
|
||||
{
|
||||
printf STDERR "Wrong -T argument, %s/server/wineserver does not exist\n", $topobjdir;
|
||||
usage;
|
||||
}
|
||||
}
|
||||
else # try to detect it automatically
|
||||
{
|
||||
if (-f "./server/wineserver") { $topobjdir = "."; }
|
||||
elsif (-f "../server/wineserver") { $topobjdir = ".."; }
|
||||
elsif (-f "../../server/wineserver") { $topobjdir = "../.."; }
|
||||
elsif (-f "../../../server/wineserver") { $topobjdir = "../../.."; }
|
||||
}
|
||||
|
||||
# set environment variables needed for Wine
|
||||
if (defined($topobjdir))
|
||||
{
|
||||
chop($topobjdir = `cd $topobjdir && pwd`);
|
||||
$ENV{LD_LIBRARY_PATH} = $topobjdir . "/dlls:" . $topobjdir . ":" . $ENV{LD_LIBRARY_PATH};
|
||||
$ENV{WINESERVER} ||= $topobjdir . "/server/wineserver";
|
||||
$ENV{WINELOADER} ||= $topobjdir . "/wine";
|
||||
$ENV{WINETEST_PLATFORM} = $platform || "wine";
|
||||
}
|
||||
else
|
||||
echo "$1 is not a directory"
|
||||
usage
|
||||
fi
|
||||
LD_LIBRARY_PATH="$topobjdir/dlls:$topobjdir:$LD_LIBRARY_PATH"
|
||||
export LD_LIBRARY_PATH
|
||||
WINESERVER="$topobjdir/server/wineserver"
|
||||
export WINESERVER
|
||||
WINELOADER="$topobjdir/wine"
|
||||
export WINELOADER
|
||||
testdir=`dirname "$0"`
|
||||
infile="$2"
|
||||
shift 2
|
||||
exec $topobjdir/programs/winetest/winetest -- -I "$testdir" $infile $@
|
||||
{
|
||||
$ENV{WINETEST_PLATFORM} = $platform || "windows";
|
||||
}
|
||||
|
||||
# check for include/ dir in script source directory and append it to search path
|
||||
my $basedir = $0;
|
||||
if ($basedir =~ /\//) { $basedir =~ s!/[^/]+$!!; }
|
||||
else { $basedir = "."; }
|
||||
if (-d $basedir . "/include") { push @include_dirs, $basedir . "/include"; }
|
||||
|
||||
$ENV{PERL5LIB} = join( ":", @include_dirs, split( ":", $ENV{PERL5LIB} ) );
|
||||
|
||||
# and now exec winetest
|
||||
if (defined($topobjdir))
|
||||
{
|
||||
exec $topobjdir . "/programs/winetest/winetest", "--", $infile, @ARGV;
|
||||
}
|
||||
exec "winetest", $infile, @ARGV;
|
||||
print STDERR "Could not exec winetest\n";
|
||||
|
|
|
|||
Loading…
Reference in New Issue