Ticket #1236: auto.format.diff

t/steps/auto/format-01.t

@@ -5 +5 @@
 
 use strict;
 use warnings;
-use Test::More tests => 16;
+use Test::More tests => 21;
 use Carp;
 use lib qw( lib t/configure/testlib );
+use_ok('config::init::defaults');
 use_ok('config::auto::format');
 use Parrot::BuildUtil;
 use Parrot::Configure;
@@ -26 +27 @@
 
 my $conf = Parrot::Configure->new();
 
+test_step_thru_runstep( $conf, q{init::defaults}, $args );
+
 my ($task, $step_name, $step, $ret);
 my $pkg = q{auto::format};
 
@@ -97 +100 @@
     );
 }
 {
-    use Config;
-    my $p5format = '%.15' . $Config{sPRIgldbl};
+    my $p5format = '%.15' . $conf->data->get_p5('sPRIgldbl');
     $p5format =~ s/"//g;; # Perl 5's Config value has embedded double quotes
     $conf->data->set( nv => 'long double' );
     auto::format::_set_floatvalfmt_nvsize($conf);
     is($conf->data->get( 'floatvalfmt' ), $p5format,
-        "floatvalfmt set as expected");
+        "floatvalfmt set as expected: nv long double");
     is($conf->data->get( 'nvsize' ), $conf->data->get( 'hugefloatvalsize' ),
-        "nvsize set as expected");
+        "nvsize set as expected: nv long double");
     $conf->data->set(
         nv          => undef,
         floatvalfmt => undef,

config/init/defaults.pm

@@ -59 +59 @@
         sig_name
         scriptdirexp
         use64bitint
+        sPRIgldbl
     | ) {
         $conf->data->set_p5( $orig => $Config{$orig} );
     }

config/auto/format.pm

@@ -15 +15 @@
 
 use strict;
 use warnings;
-use Config;  # for long double printf format
 
 use base qw(Parrot::Configure::Step);
 
@@ -75 +74 @@
         # Stay way from long double for now (it may be 64 or 80 bits)
         # die "long double not supported at this time, use double.";
         $nvsize   = $ldsize;
-        if (defined($Config{'sPRIgldbl'})) {
-            $nvformat = "%.15" .  $Config{'sPRIgldbl'};
+        my $spri = $conf->data->get_p5('sPRIgldbl');
+        if ( defined $spri ) {
+            $nvformat = "%.15" .  $spri;
             $nvformat =~ s/"//g;   # Perl 5's Config value has embedded double quotes
         }
         else {