Thread: [Lxr-commits] CVS: lxr-tools/tests ConfigTest.pm, 1.1, 1.2 PlainTest.pm, 1.1, 1.2 TestRunner.pl, 1.
Brought to you by:
ajlittoz
From: Malcolm B. <mb...@us...> - 2009-04-21 16:49:11
|
Update of /cvsroot/lxr/lxr-tools/tests In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14381 Modified Files: ConfigTest.pm PlainTest.pm TestRunner.pl lxr.conf Log Message: Updated to account for new location of files Index: ConfigTest.pm =================================================================== RCS file: /cvsroot/lxr/lxr-tools/tests/ConfigTest.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ConfigTest.pm 21 Apr 2009 15:25:00 -0000 1.1 +++ ConfigTest.pm 21 Apr 2009 16:48:58 -0000 1.2 @@ -5,8 +5,6 @@ use strict; use Test::Unit; -use lib ".."; -use lib "../lib"; use LXR::Config; Index: PlainTest.pm =================================================================== RCS file: /cvsroot/lxr/lxr-tools/tests/PlainTest.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PlainTest.pm 21 Apr 2009 15:25:00 -0000 1.1 +++ PlainTest.pm 21 Apr 2009 16:48:58 -0000 1.2 @@ -18,7 +18,7 @@ use vars qw($root); -$root = "$FindBin::Bin/test-src/"; +$root = "../test-data/source/"; $config = new LXR::Config("http://test/lxr", "./lxr.conf"); @@ -70,9 +70,11 @@ my $f = $self->{'plain'}; my $file = $f->getfile("/aFile.txt", '5.5.4'); + $self->assert($file, "Getfile failed"); local ($/) = undef; open FILE, "<". "$root/5.5.4/aFile.txt" || die "Can't open file"; my $ref = <FILE>; + $self->assert($ref, "Couldn't read file"); $self->assert($file eq $ref, "Files not matching"); } Index: TestRunner.pl =================================================================== RCS file: /cvsroot/lxr/lxr-tools/tests/TestRunner.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TestRunner.pl 21 Apr 2009 15:25:00 -0000 1.1 +++ TestRunner.pl 21 Apr 2009 16:48:58 -0000 1.2 @@ -4,6 +4,8 @@ use Test::Unit::Debug qw(debug_pkgs); use Test::Unit::TestRunner; +use lib "../../lxr/lib"; +use lib "../../lxr"; # Uncomment and edit to debug individual packages. #debug_pkgs(qw/Test::Unit::TestCase/); Index: lxr.conf =================================================================== RCS file: /cvsroot/lxr/lxr-tools/tests/lxr.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- lxr.conf 21 Apr 2009 15:25:00 -0000 1.1 +++ lxr.conf 21 Apr 2009 16:48:58 -0000 1.2 @@ -7,22 +7,22 @@ # Path to glimpse executable. # Define this OR the swish-e variables depending which search engine you want to use. - 'glimpsebin' => '/test/lxr/bin/glimpse', + 'glimpsebin' => 'glimpse', # Location of SWISH-E indexer binary 'swishindex' => '/test/lxr/bin/swish-e', # Location of SWISH-E search binary - 'swishsearch' => '/test/lxr/bin/swish-e', + 'swishsearch' => 'swish-e', # Path to Exuberant Ctags executable - 'ectagsbin' => '/test/lxr/bin/ctags', + 'ectagsbin' => 'ctags', # Place where lxr can write temporary files 'tmpdir' => '/tmp', # Location of the Generic.pm config file - 'genericconf' => '../lib/LXR/Lang/generic.conf', + 'genericconf' => '../../lxr/lib/LXR/Lang/generic.conf', # Paths for CVS module 'cvspath' => '/bin:/usr/local/bin:/usr/bin:/usr/sbin', @@ -30,7 +30,6 @@ }, { - # Configuration for http://192.168.1.3/lxr. # baseurl is used to select configuration block. 'baseurl' => 'http://test/lxr', # Put your URL here @@ -43,16 +42,6 @@ # ennumerated. # From a file: 'range' => [ readfile('test-versions') ], - # Explicitly: - # 'range' => [qw(v1 v2 v3.1 v4 experimental)], - # If files within a tree can have different versions, - # e.g in a CVS tree, 'range' can be specified as a - # function to call for each file: - #'range' => sub { return - # ($files->allreleases($LXR::Common::pathname), - # $files->allrevisions($LXR::Common::pathname)) - # }, # deferred function call. - # The default version to display 'default' => '1.0.6'}, @@ -61,12 +50,6 @@ 'range' => [qw(i386 alpha arm m68k mips ppc sparc sparc64)]}, }, - # These do funky things to paths in the system - you probably don't need them. - 'maps' => { - '/include/asm[^\/]*/' => '/include/asm-$a/', - '/arch/[^\/]+/' => '/arch/$a/', - }, - # Templates used for headers and footers 'htmlhead' => 'html-head.html', @@ -86,16 +69,12 @@ # indexed-src/version2/... # The names of the version directories must match the values for the Version # variable above. - 'sourceroot' => '/home/malcolm/indexed-src', - # Alternatively, this can specify a CVS repository by setting the value to "cvs:" - # followed by the path to the repository. Note this must be file accessible - remote - # server access does NOT work. - # 'sourceroot' => 'cvs:/hom/karsk/a/CVSROOT/linux', + 'sourceroot' => '../test-data/source/', # The name to display for this source tree - 'sourcerootname' => 'Example', - + 'sourcerootname' => 'Test Configuration', 'sourceparams' => {'cachepath' => '/a/path/to/cache', 'param2' => 'secondparam'}, + # The DBI identifier for the database to use # For mysql, the format is dbi:mysql:dbname=<name> # for Postgres, it is dbi:Pg:dbname=<name> @@ -108,10 +87,10 @@ # 'dbuser' => 'lxr', # For using glimpse, the directory to store the .glimpse files in is required - 'glimpsedir' => '/path/to/glimpse/databases', + 'glimpsedir' => '/tmp/lxr-glimpse', # Location of swish-e index database files if using swish-e - 'swishdir' => '/a/directory/here/', + 'swishdir' => '/tmp/lxr-swishe/', # where to look for include files inside the sourcetree. This is used to hyperlink |