Browse Source

* update Makefile

git-svn-id: trunk@9530 -
pierre 17 years ago
parent
commit
6373e3f6b5
2 changed files with 8 additions and 9 deletions
  1. 4 1
      tests/utils/testsuite/Makefile.fpc
  2. 4 8
      tests/utils/testsuite/utests.pp

+ 4 - 1
tests/utils/testsuite/Makefile.fpc

@@ -7,8 +7,11 @@ name=testsuite
 version=1.9.9
 version=1.9.9
 
 
 [require]
 [require]
-nortl=fcl
+packages=fcl
 libc=y
 libc=y
 
 
+[compiler]
+unitdir=..
+
 [target]
 [target]
 programs=testsuite
 programs=testsuite

+ 4 - 8
tests/utils/testsuite/utests.pp

@@ -8,13 +8,13 @@ uses cgiapp,sysutils,mysql41conn,sqldb,whtml,dbwhtml,db,
      tresults,
      tresults,
      Classes,ftFont,fpimage,fpimgcanv,fpWritePng,fpcanvas;
      Classes,ftFont,fpimage,fpimgcanv,fpWritePng,fpcanvas;
 
 
-{$ifndef TEST}
 const
 const
+{$ifndef TEST}
   CGI = 'testsuite.cgi';
   CGI = 'testsuite.cgi';
 {$else TEST}
 {$else TEST}
-const
   CGI = 'testsuite-new.cgi';
   CGI = 'testsuite-new.cgi';
 {$endif TEST}
 {$endif TEST}
+  ViewVCURL='http://svn.freepascal.org/cgi-bin/viewvc.cgi/trunk/tests/';
 
 
 Type
 Type
   TTestSuite = Class(TCgiApplication)
   TTestSuite = Class(TCgiApplication)
@@ -992,9 +992,7 @@ begin
                 HeaderStart(3);
                 HeaderStart(3);
                 DumpLn('<P>No Source in TestSuite DataBase.</P>');
                 DumpLn('<P>No Source in TestSuite DataBase.</P>');
                 DumpLn('Link to SVN view of '+
                 DumpLn('Link to SVN view of '+
-                  '<A HREF="http://www.freepascal.org'+
-                  '/cgi-bin/viewcvs.cgi/trunk/tests/'+
-                  FTestFileName+'?view=markup'+
+                  '<A HREF="'+ViewVCURL+FTestFileName+'?view=markup'+
                   '" TARGET="_blank"> '+FTestFileName+'</A> source. ');
                   '" TARGET="_blank"> '+FTestFileName+'</A> source. ');
                 HeaderEnd(3);
                 HeaderEnd(3);
               end
               end
@@ -1002,9 +1000,7 @@ begin
               begin
               begin
                 HeaderStart(3);
                 HeaderStart(3);
                 DumpLn('Link to SVN view of '+
                 DumpLn('Link to SVN view of '+
-                  '<A HREF="http://www.freepascal.org'+
-                  '/cgi-bin/viewcvs.cgi/trunk/tests/'+
-                  FTestFileName+'?view=markup'+
+                  '<A HREF="'+ViewVCURL+FTestFileName+'?view=markup'+
                   '" TARGET="_blank"> '+FTestFileName+'</A> source. ');
                   '" TARGET="_blank"> '+FTestFileName+'</A> source. ');
                 HeaderEnd(3);
                 HeaderEnd(3);
               end;  
               end;