Browse Source

* fixed library tests
* fix test cases to generate their own temporary files

peter 21 years ago
parent
commit
161cbe3824
6 changed files with 27 additions and 10 deletions
  1. 2 2
      tests/Makefile
  2. 2 2
      tests/Makefile.fpc
  3. 8 1
      tests/tbs/tb0084.pp
  4. 2 2
      tests/tbs/tb0193.pp
  5. 6 2
      tests/utils/dotest.pp
  6. 7 1
      tests/webtbs/tw1479.pp

+ 2 - 2
tests/Makefile

@@ -1551,8 +1551,8 @@ units:
 			 OPT="$(TEST_OPT)" CCOMPILER=$(TEST_CCOMPILER) BINUTILSPREFIX=$(TEST_BINUTILSPREFIX)
 			 OPT="$(TEST_OPT)" CCOMPILER=$(TEST_CCOMPILER) BINUTILSPREFIX=$(TEST_BINUTILSPREFIX)
 copyfiles: $(TEST_OUTPUTDIR)
 copyfiles: $(TEST_OUTPUTDIR)
 	$(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/ctest.o test/cg
 	$(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/ctest.o test/cg
-	-$(MKDIRTREE) $(TEST_OUTPUTDIR)/tests/units/system
-	$(COPY) test/units/system/test*.txt $(TEST_OUTPUTDIR)/tests/units/system
+	-$(MKDIRTREE) $(TEST_OUTPUTDIR)/test/units/system
+	$(COPY) test/units/system/test*.txt $(TEST_OUTPUTDIR)/test/units/system
 testprep: testprep-stamp.$(TEST_FULL_TARGET)
 testprep: testprep-stamp.$(TEST_FULL_TARGET)
 testprep-stamp.$(TEST_FULL_TARGET): $(TEST_OUTPUTDIR) utils units copyfiles
 testprep-stamp.$(TEST_FULL_TARGET): $(TEST_OUTPUTDIR) utils units copyfiles
 	$(ECHO) $(DATE) > testprep-stamp.$(TEST_FULL_TARGET)
 	$(ECHO) $(DATE) > testprep-stamp.$(TEST_FULL_TARGET)

+ 2 - 2
tests/Makefile.fpc

@@ -142,8 +142,8 @@ units:
 
 
 copyfiles: $(TEST_OUTPUTDIR)
 copyfiles: $(TEST_OUTPUTDIR)
         $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/ctest.o test/cg
         $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/ctest.o test/cg
-        -$(MKDIRTREE) $(TEST_OUTPUTDIR)/tests/units/system
-        $(COPY) test/units/system/test*.txt $(TEST_OUTPUTDIR)/tests/units/system
+        -$(MKDIRTREE) $(TEST_OUTPUTDIR)/test/units/system
+        $(COPY) test/units/system/test*.txt $(TEST_OUTPUTDIR)/test/units/system
 
 
 ################################
 ################################
 # Preparation for tests
 # Preparation for tests

+ 8 - 1
tests/tbs/tb0084.pp

@@ -10,7 +10,14 @@ var
  L:longint;
  L:longint;
  S:string;
  S:string;
 begin
 begin
- assign(F,'tbs/tb0084.pp');           { Assign F to itself }
+ { Create temp }
+ assign(F,'tb0084.tmp');           { Assign F to itself }
+ rewrite(f);
+ for l:=1 to 100 do
+   writeln('Hello world');
+ close(f);
+   
+ assign(F,'tb0084.tmp');           { Assign F to itself }
  reset(F);                             { Open it (as a textfile) }
  reset(F);                             { Open it (as a textfile) }
  ReadLn(F);                            { Just read some lines }
  ReadLn(F);                            { Just read some lines }
  ReadLn(F);
  ReadLn(F);

+ 2 - 2
tests/tbs/tb0193.pp

@@ -1,10 +1,10 @@
 { Old file: tbs0227.pp }
 { Old file: tbs0227.pp }
 { external var does strange things when declared in localsymtable OK 0.99.11 (PFV) }
 { external var does strange things when declared in localsymtable OK 0.99.11 (PFV) }
 
 
-function getstacksize:longint;assembler;
 var
 var
   stacksize : ptrint;external name '__stklen';
   stacksize : ptrint;external name '__stklen';
-//  sbrk : longint;external name '___sbrk';
+
+function getstacksize:longint;assembler;
 asm
 asm
 {$ifdef CPUI386}
 {$ifdef CPUI386}
         movl    stacksize,%eax
         movl    stacksize,%eax

+ 6 - 2
tests/utils/dotest.pp

@@ -473,7 +473,7 @@ begin
 {$ifdef unix}
 {$ifdef unix}
   { Add runtime library path to current dir to find .so files }
   { Add runtime library path to current dir to find .so files }
   if Config.NeedLibrary then
   if Config.NeedLibrary then
-   args:=args+' ''-k-rpath .''';
+   args:=args+' -Fl'+TestOutputDir+' ''-k-rpath .''';
 {$endif unix}
 {$endif unix}
   if Config.NeedOptions<>'' then
   if Config.NeedOptions<>'' then
    args:=args+' '+Config.NeedOptions;
    args:=args+' '+Config.NeedOptions;
@@ -1081,7 +1081,11 @@ begin
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.40  2004-11-09 21:26:29  peter
+  Revision 1.41  2004-11-09 23:13:50  peter
+    * fixed library tests
+    * fix test cases to generate their own temporary files
+
+  Revision 1.40  2004/11/09 21:26:29  peter
     * use ./ before executable under unix
     * use ./ before executable under unix
 
 
   Revision 1.39  2004/11/09 17:26:28  peter
   Revision 1.39  2004/11/09 17:26:28  peter

+ 7 - 1
tests/webtbs/tw1479.pp

@@ -4,12 +4,18 @@ uses
   sysutils;
   sysutils;
 
 
 const
 const
-  fname = 'Makefile';
+  fname = 'tw1479.tmp';
 
 
  ThisDir = '.'+DirectorySeparator;
  ThisDir = '.'+DirectorySeparator;
 var
 var
   fn : string;
   fn : string;
+  f : text;
 begin
 begin
+  assign(f,fname);
+  rewrite(f);
+  writeln(f,'hello');
+  close(f);
+  
   fn:=FileSearch(fname,PathSeparator);
   fn:=FileSearch(fname,PathSeparator);
   writeln('found: ',fn);
   writeln('found: ',fn);
   if fn<>fname then
   if fn<>fname then