texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[8281] test_utils.pl generate in srcdir not builddir


From: gavinsmith0123
Subject: [8281] test_utils.pl generate in srcdir not builddir
Date: Sat, 13 Oct 2018 12:23:03 -0400 (EDT)

Revision: 8281
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8281
Author:   gavin
Date:     2018-10-13 12:23:03 -0400 (Sat, 13 Oct 2018)
Log Message:
-----------
test_utils.pl generate in srcdir not builddir

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/t/test_utils.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-10-13 16:05:29 UTC (rev 8280)
+++ trunk/ChangeLog     2018-10-13 16:23:03 UTC (rev 8281)
@@ -1,5 +1,10 @@
 2018-10-13  Gavin Smith  <address@hidden>
 
+       * tp/t/test_utils.pl: If -g flag is given to regenerate 
+       reference test results, do so in srcdir rather than builddir.
+
+2018-10-13  Gavin Smith  <address@hidden>
+
        * tp/tests/formatting/list-of-tests (direntry_dircategory_info_split):
        Remove.
        * tp/t/92formatting.t (direntry_dircategory_info_split): Add.

Modified: trunk/tp/t/test_utils.pl
===================================================================
--- trunk/tp/t/test_utils.pl    2018-10-13 16:05:29 UTC (rev 8280)
+++ trunk/tp/t/test_utils.pl    2018-10-13 16:23:03 UTC (rev 8281)
@@ -359,7 +359,7 @@
               'DEBUG' => $debug, 'test_formats' => $test_formats};
   
   if ($generate) {
-    mkdir "t/results/$name" if (! -d "t/results/$name");
+    mkdir $srcdir."t/results/$name" if (! -d $srcdir."t/results/$name");
   }
   bless $test;
   return $test;
@@ -755,24 +755,24 @@
         my $base = "t/results/$self->{'name'}/$test_name/";
         my $test_out_dir;
         if ($self->{'generate'}) {
-          $test_out_dir = 'res_'.$format_type;
-          if (-d $base."$test_out_dir/") {
-             
unlink_dir_files("t/results/$self->{'name'}/$test_name/$test_out_dir/");
+          $base = $srcdir.$base;
+          $test_out_dir = $base.'res_'.$format_type;
+          if (-d $test_out_dir) {
+            unlink_dir_files($test_out_dir);
           }
         } else {
-          $test_out_dir = 'out_'.$format_type;
+          $test_out_dir = $base.'out_'.$format_type;
         }
         if (!defined($format_converter_options->{'SUBDIR'})) {
           mkdir ($base) 
             if (! -d $base);
-          if (! -d $base."$test_out_dir/") {
-            mkdir ($base."$test_out_dir/"); 
+          if (! -d $test_out_dir) {
+            mkdir ($test_out_dir); 
           } else {
             # remove any files from previous runs
-            unlink glob ($base."$test_out_dir/*"); 
+            unlink glob ("$test_out_dir/*"); 
           }
-          $format_converter_options->{'SUBDIR'} 
-             = $base."$test_out_dir/";
+          $format_converter_options->{'SUBDIR'} = $test_out_dir;
         }
       } elsif (!defined($format_converter_options->{'OUTFILE'})) {
         $format_converter_options->{'OUTFILE'} = '';
@@ -872,10 +872,16 @@
     local $Data::Dumper::Purity = 1;
     local $Data::Dumper::Indent = 1;
 
-    my $out_file = $new_file;
-    $out_file = $file if ($self->{'generate'});
+    my $out_file;
+    if (!$self->{'generate'}) {
+      $out_file = $new_file;
+      mkdir "t/results/$self->{'name'}" if (! -d "t/results/$self->{'name'}");
+    } else {
+      $out_file = $srcdir.$file;
+      mkdir $srcdir."t/results/$self->{'name'}"
+        if (! -d $srcdir."t/results/$self->{'name'}");
+    }
 
-    mkdir "t/results/$self->{'name'}" if (! -d "t/results/$self->{'name'}");
     open (OUT, ">$out_file") or die "Open $out_file: $!\n";
     binmode (OUT, ":encoding(utf8)");
     print OUT 'use vars qw(%result_texis %result_texts %result_trees 
%result_errors '."\n".




reply via email to

[Prev in Thread] Current Thread [Next in Thread]