diff options
| -rwxr-xr-x | t/lib/h2ph.t | 7 | ||||
| -rw-r--r-- | utils/h2ph.PL | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/t/lib/h2ph.t b/t/lib/h2ph.t index 614c74d964..1fa7f63536 100755 --- a/t/lib/h2ph.t +++ b/t/lib/h2ph.t @@ -22,12 +22,7 @@ unless(-e '../utils/h2ph') { # i'll probably get in trouble for this :) } else { # does it run? - if ($^O ne 'dos') { - $ok = system("./perl -I../lib ../utils/h2ph -d. lib/h2ph.h"); - } else { - # h2ph prints some info which confuses t/TEST on dos/djgpp - $ok = system("./perl -I../lib ../utils/h2ph -d. lib/h2ph.h >nul"); - } + $ok = system("./perl -I../lib ../utils/h2ph -d. -Q lib/h2ph.h"); print(($ok == 0 ? "" : "not "), "ok 1\n"); # does it work? well, does it do what we expect? :-) diff --git a/utils/h2ph.PL b/utils/h2ph.PL index 35cb7ccee9..066f2c9c3f 100644 --- a/utils/h2ph.PL +++ b/utils/h2ph.PL @@ -40,7 +40,7 @@ use Config; use File::Path qw(mkpath); use Getopt::Std; -getopts('Dd:rlha'); +getopts('Dd:rlhaQ'); die "-r and -a options are mutually exclusive\n" if ($opt_r and $opt_a); @inc_dirs = inc_dirs() if $opt_a; @@ -81,7 +81,7 @@ while (defined ($file = next_file())) { open(OUT, ">-"); } else { ($outfile = $file) =~ s/\.h$/.ph/ || next; - print "$file -> $outfile\n"; + print "$file -> $outfile\n" unless $opt_Q; if ($file =~ m|^(.*)/|) { $dir = $1; mkpath "$Dest_dir/$dir"; @@ -237,7 +237,7 @@ while (defined ($file = next_file())) { } elsif(/^ident\s+(.*)/) { print OUT $t, "# $1\n"; } - } elsif(/^\s*(typedef\s*)?enum(\s+[a-zA-Z_]\w*)?\s*\{/) { + } elsif(/^\s*(typedef\s*)?enum\s*(\s+[a-zA-Z_]\w*\s*)?\{/) { until(/\}.*?;/) { chomp($next = <IN>); $_ .= $next; |