[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: texinfo-7.0.1 on OpenSolaris
From: |
Gavin Smith |
Subject: |
Re: texinfo-7.0.1 on OpenSolaris |
Date: |
Tue, 3 Jan 2023 21:28:03 +0000 |
On Mon, Jan 02, 2023 at 03:46:56PM +0000, Gavin Smith wrote:
> One way of fixing this might be to put the generated file in a
> subdirectory so that make can't see it. Or it might not be worth
> bothering as this version of make and/or operating system isn't
> very important. Another alternative is to remove the Latin-1 filename
> tests completely for all systems.
A patch for the first way is at the bottom of this mail. It only
involves changing two files. Any comments?
I haven't been able to test this in the VM yet - I will do so when
"make dist" is working again in the Texinfo sources, so I can copy
a new distribution archive into the VM.
diff --git a/tp/tests/Makefile.am b/tp/tests/Makefile.am
index 1973cacd0d..5d1580a419 100644
--- a/tp/tests/Makefile.am
+++ b/tp/tests/Makefile.am
@@ -64,10 +64,10 @@ other-checks: all
check_DATA = input_file_names_recoded_stamp.txt
input_file_names_recoded_stamp.txt: $(srcdir)/input/included_latin1.texi
- if $(PERL) $(srcdir)/../maintain/copy_change_file_name_encoding.pl
$(srcdir)/input/included_latin1.texi . ; then echo 'OK' > $@ ; else echo
'FAILED' > $@ ; fi
+ mkdir -p built_input ; if $(PERL)
$(srcdir)/../maintain/copy_change_file_name_encoding.pl
$(srcdir)/input/included_latin1.texi built_input ; then echo 'OK' > $@ ; else
echo 'FAILED' > $@ ; fi
distclean-local:
- rm -f input_file_names_recoded_stamp.txt included_lat*n1.texi
+ rm -f input_file_names_recoded_stamp.txt built_input
EXTRA_DIST = run_parser_all.sh parser_tests.sh \
$(one_test_files_generated_list) coverage_macro.texi included_akçentêd.texi \
diff --git a/tp/tests/run_parser_all.sh b/tp/tests/run_parser_all.sh
index 17cd5d8939..e1e06c8450 100755
--- a/tp/tests/run_parser_all.sh
+++ b/tp/tests/run_parser_all.sh
@@ -414,7 +414,7 @@ while read line; do
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 $command_run $format_option --force
--conf-dir $srcdir/../t/init/ --conf-dir $srcdir/../init --conf-dir
$srcdir/../ext -I $srcdir/$testdir -I $testdir/ -I $srcdir/ -I .
--error-limit=1000 -c TEST=1 $l2h_flags --output ${outdir}$dir/
$remaining_out_dir $src_file > ${outdir}$dir/$basename.1
2>${outdir}$dir/$basename.2"
+ cmd="$prepended_command $PERL -w $command_run $format_option --force
--conf-dir $srcdir/../t/init/ --conf-dir $srcdir/../init --conf-dir
$srcdir/../ext -I $srcdir/$testdir -I $testdir/ -I $srcdir/ -I . -I built_input
--error-limit=1000 -c TEST=1 $l2h_flags --output ${outdir}$dir/
$remaining_out_dir $src_file > ${outdir}$dir/$basename.1
2>${outdir}$dir/$basename.2"
echo "$cmd" >>$logfile
eval $cmd
ret=$?
Re: texinfo-7.0.1 on OpenSolaris, Bruno Haible, 2023/01/02