[6387] look for built module in $builddir when running tests

texinfo-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6387] look for built module in $builddir when running tests

From:	Gavin D. Smith
Subject:	[6387] look for built module in $builddir when running tests
Date:	Sat, 04 Jul 2015 13:59:26 +0000
Revision: 6387
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6387
Author:   gavin
Date:     2015-07-04 13:59:24 +0000 (Sat, 04 Jul 2015)
Log Message:
-----------
look for built module in $builddir when running tests

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Makefile.am
    trunk/tp/tests/htmlxref/Makefile.am
    trunk/tp/tests/htmlxref-only_mono/Makefile.am
    trunk/tp/tests/htmlxref-only_split/Makefile.am
    trunk/tp/tests/many_input_files/Makefile.am
    trunk/tp/tests/run_parser_all.sh
    trunk/tp/tests/t/stdout.sh
    trunk/tp/tests/t/stdout_split.sh

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-04 13:46:49 UTC (rev 6386)
+++ trunk/ChangeLog     2015-07-04 13:59:24 UTC (rev 6387)
@@ -1,5 +1,18 @@
 2015-07-04  Gavin Smith  <address@hidden>
 
+       * tp/Makefile.am,
+       * tp/tests/htmlxref/Makefile.am,
+       * tp/tests/htmlxref-only_mono/Makefile.am,
+       * tp/tests/htmlxref-only_split/Makefile.am,
+       * tp/tests/many_input_files/Makefile.am,
+       * tp/tests/run_parser_all.sh,
+       * tp/tests/t/stdout.sh,
+       * tp/tests/t/stdout_split.sh:
+       Look for XSParagraph.la file in $builddir and XSParagraph.pm in
+       $srcdir, to facilitate VPATH builds.
+
+2015-07-04  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/XSParagraph/configure.ac: Retrieve
        "privlibexp" Perl configuration value.
        * tp/Texinfo/Convert/XSParagraph/Makefile.am: Use it for 

Modified: trunk/tp/Makefile.am
===================================================================
--- trunk/tp/Makefile.am        2015-07-04 13:46:49 UTC (rev 6386)
+++ trunk/tp/Makefile.am        2015-07-04 13:59:24 UTC (rev 6387)
@@ -178,8 +178,8 @@
                        $(top_srcdir)/build-aux/tap-driver.sh
 T_LOG_COMPILER = $(PERL)
 AM_T_LOG_FLAGS = -w
-AM_T_LOG_FLAGS += -ITexinfo/Convert/XSParagraph/lib
-AM_T_LOG_FLAGS += -ITexinfo/Convert/XSParagraph/blib/arch
+AM_T_LOG_FLAGS += -ITexinfo/Convert/XSParagraph
+AM_T_LOG_FLAGS += -I$(srcdir)/Texinfo/Convert/XSParagraph/lib
 
 AM_TESTS_ENVIRONMENT = srcdir="$(srcdir)"; export srcdir; 
top_srcdir="$(top_srcdir)"; export top_srcdir;
 

Modified: trunk/tp/tests/htmlxref/Makefile.am
===================================================================
--- trunk/tp/tests/htmlxref/Makefile.am 2015-07-04 13:46:49 UTC (rev 6386)
+++ trunk/tp/tests/htmlxref/Makefile.am 2015-07-04 13:59:24 UTC (rev 6387)
@@ -8,6 +8,7 @@
          -base .
 
 TESTS = $(one_test_files_generated_list)
+AM_TESTS_ENVIRONMENT = 
PERL5LIB='$(top_builddir)/tp/Texinfo/Convert/XSParagraph'; export PERL5LIB;
 
 copy-tests:
        $(srcdir)/../run_parser_all.sh -copy

Modified: trunk/tp/tests/htmlxref-only_mono/Makefile.am
===================================================================
--- trunk/tp/tests/htmlxref-only_mono/Makefile.am       2015-07-04 13:46:49 UTC 
(rev 6386)
+++ trunk/tp/tests/htmlxref-only_mono/Makefile.am       2015-07-04 13:59:24 UTC 
(rev 6387)
@@ -8,6 +8,7 @@
          -base .
 
 TESTS = $(one_test_files_generated_list)
+AM_TESTS_ENVIRONMENT = 
PERL5LIB='$(top_builddir)/tp/Texinfo/Convert/XSParagraph'; export PERL5LIB;
 
 copy-tests:
        $(srcdir)/../run_parser_all.sh -copy

Modified: trunk/tp/tests/htmlxref-only_split/Makefile.am
===================================================================
--- trunk/tp/tests/htmlxref-only_split/Makefile.am      2015-07-04 13:46:49 UTC 
(rev 6386)
+++ trunk/tp/tests/htmlxref-only_split/Makefile.am      2015-07-04 13:59:24 UTC 
(rev 6387)
@@ -8,6 +8,7 @@
          -base .
 
 TESTS = $(one_test_files_generated_list)
+AM_TESTS_ENVIRONMENT = 
PERL5LIB='$(top_builddir)/tp/Texinfo/Convert/XSParagraph'; export PERL5LIB;
 
 copy-tests:
        $(srcdir)/../run_parser_all.sh -copy

Modified: trunk/tp/tests/many_input_files/Makefile.am
===================================================================
--- trunk/tp/tests/many_input_files/Makefile.am 2015-07-04 13:46:49 UTC (rev 
6386)
+++ trunk/tp/tests/many_input_files/Makefile.am 2015-07-04 13:59:24 UTC (rev 
6387)
@@ -14,6 +14,7 @@
   indices_res index_split_res tex_l2h_res tex_t4ht_res
 
 TESTS = indices.sh tex_l2h.sh tex_t4ht.sh
+AM_TESTS_ENVIRONMENT = 
PERL5LIB='$(top_builddir)/tp/Texinfo/Convert/XSParagraph'; export PERL5LIB;
 
 test_dirs = indices index_split
 tex_html_dirs = tex_l2h tex_t4ht

Modified: trunk/tp/tests/run_parser_all.sh
===================================================================
--- trunk/tp/tests/run_parser_all.sh    2015-07-04 13:46:49 UTC (rev 6386)
+++ trunk/tp/tests/run_parser_all.sh    2015-07-04 13:59:24 UTC (rev 6387)
@@ -274,8 +274,7 @@
       # @setfilename
       echo "$command $dir" >>$logfile
       #echo "$dir($format)"
-      cmd="$prepended_command $PERL -w -I $srcdir/../ -I 
$srcdir/../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../maintain/lib/libintl-perl/lib/ -I 
$srcdir/../maintain/lib/Text-Unidecode/lib/ -I 
../tp/Texinfo/Convert/XSParagraph -I ../tp/Texinfo/Convert/XSParagraph/lib 
$command_run $format_option --force --conf-dir $srcdir/../t/init/ --conf-dir 
$srcdir/../init --error-limit=1000 --set-customization-variable TEST=1 
--set-customization-variable L2H_CLEAN=0 --output ${outdir}$dir/ -I $testdir/ 
-I $srcdir/ --set-customization-variable=DUMP_TEXI=1 
--macro-expand=${outdir}$dir/$basename.texi $remaining_out_dir $src_file 
2>${outdir}$dir/$basename.2" >> $logfile
-      # Note we didn't use $srcdir in the XSParagraph -I options.
+      cmd="$prepended_command $PERL -w -I $srcdir/../ -I 
$srcdir/../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../maintain/lib/libintl-perl/lib/ -I 
$srcdir/../maintain/lib/Text-Unidecode/lib/ -I 
../../tp/Texinfo/Convert/XSParagraph -I 
$srcdir/tp/Texinfo/Convert/XSParagraph/lib $command_run $format_option --force 
--conf-dir $srcdir/../t/init/ --conf-dir $srcdir/../init --error-limit=1000 
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0 
--output ${outdir}$dir/ -I $testdir/ -I $srcdir/ 
--set-customization-variable=DUMP_TEXI=1 
--macro-expand=${outdir}$dir/$basename.texi $remaining_out_dir $src_file 
2>${outdir}$dir/$basename.2" >> $logfile
       echo "$cmd" >>$logfile
       eval $cmd
       ret=$?
@@ -326,7 +325,7 @@
       mkdir "${outdir}$dir"
       remaining_out_dir=`echo $remaining | sed 
's,@OUT_DIR@,'"${outdir}$dir/"',g'`
       echo "$command $dir -> ${outdir}$dir" >> $logfile
-      cmd="$prepended_command $PERL -w -I $srcdir/../ -I 
$srcdir/../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../maintain/lib/libintl-perl/lib/ -I 
$srcdir/../maintain/lib/Text-Unidecode/lib/ $command_run $format_option --force 
--conf-dir $srcdir/../t/init/ --conf-dir $srcdir/../init -I $testdir/ -I 
$srcdir/ --set-customization-variable L2H_FILE=$srcdir/../t/init/l2h.init 
--error-limit=1000 --set-customization-variable TEST=1 
--set-customization-variable L2H_CLEAN=0 $l2h_tmp_dir --output ${outdir}$dir/ 
$remaining_out_dir $src_file > ${outdir}$dir/$basename.1 
2>${outdir}$dir/$basename.2"
+      cmd="$prepended_command $PERL -w -I $srcdir/../ -I 
$srcdir/../maintain/lib/Unicode-EastAsianWidth/lib/ -I 
$srcdir/../maintain/lib/libintl-perl/lib/ -I 
$srcdir/../maintain/lib/Text-Unidecode/lib/ -I 
../../tp/Texinfo/Convert/XSParagraph -I 
$srcdir/tp/Texinfo/Convert/XSParagraph/lib $command_run $format_option --force 
--conf-dir $srcdir/../t/init/ --conf-dir $srcdir/../init -I $testdir/ -I 
$srcdir/ --set-customization-variable L2H_FILE=$srcdir/../t/init/l2h.init 
--error-limit=1000 --set-customization-variable TEST=1 
--set-customization-variable L2H_CLEAN=0 $l2h_tmp_dir --output ${outdir}$dir/ 
$remaining_out_dir $src_file > ${outdir}$dir/$basename.1 
2>${outdir}$dir/$basename.2"
       echo "$cmd" >>$logfile
       eval $cmd
       ret=$?

Modified: trunk/tp/tests/t/stdout.sh
===================================================================
--- trunk/tp/tests/t/stdout.sh  2015-07-04 13:46:49 UTC (rev 6386)
+++ trunk/tp/tests/t/stdout.sh  2015-07-04 13:59:24 UTC (rev 6387)
@@ -10,5 +10,5 @@
 # to regenerate the reference:
 # ../texi2any.pl -o - --plaintext formatting/simplest.texi > 
reference/stdout.txt 2>&1
 
-$PERL $srcdir/../texi2any.pl -o - --plaintext $srcdir/formatting/simplest.texi 
2>&1 | diff - $srcdir/reference/stdout.txt
+$PERL -I ../../tp/Texinfo/Convert/XSParagraph $srcdir/../texi2any.pl -o - 
--plaintext $srcdir/formatting/simplest.texi 2>&1 | diff - 
$srcdir/reference/stdout.txt
 

Modified: trunk/tp/tests/t/stdout_split.sh
===================================================================
--- trunk/tp/tests/t/stdout_split.sh    2015-07-04 13:46:49 UTC (rev 6386)
+++ trunk/tp/tests/t/stdout_split.sh    2015-07-04 13:59:24 UTC (rev 6387)
@@ -10,5 +10,5 @@
 # to regenerate the reference:
 # ../texi2any.pl -o - --plaintext --split chapter formatting/simplest.texi > 
reference/stdout_split.txt 2>&1
 
-$PERL $srcdir/../texi2any.pl -o - --plaintext --split chapter 
$srcdir/formatting/simplest.texi 2>&1 | diff - 
$srcdir/reference/stdout_split.txt
+$PERL -I ../../tp/Texinfo/Convert/XSParagraph $srcdir/../texi2any.pl -o - 
--plaintext --split chapter $srcdir/formatting/simplest.texi 2>&1 | diff - 
$srcdir/reference/stdout_split.txt
[Prev in Thread]
Current Thread
[Next in Thread]
[6387] look for built module in $builddir when running tests, Gavin D. Smith <=
Prev by Date: [6386] xsubpp -typemap
Next by Date: [6388] always output ...
Previous by thread: [6386] xsubpp -typemap
Next by thread: [6388] always output ...
Index(es):
- Date
- Thread