Index: t/op/sysinfo.t =================================================================== --- t/op/sysinfo.t (revision 42340) +++ t/op/sysinfo.t (working copy) @@ -116,18 +116,15 @@ } } -# 5 & 6 -if ( $PConfig{osname} eq 'MSWin32' ) { - # Windows 5 & 6 +SKIP: +{ + $PConfig{osname} eq 'MSWin32' + or skip "Tests only meaningful on Win32", 2; SKIP: { eval { require Win32; } or skip "requires package Win32 for these tests", 2; - # specifically don't use $Config{osvers} - # because it probably was the system perl was compiled on - # and we can do much better than that - my $osname = Win32::GetOSName(); $osname = 'WinXP' if $osname =~ m/^WinXP/; TODO: { @@ -145,32 +142,10 @@ print S1 end CODE - } - } -} -else { - # Other 5 & 6 + } # END TODO block + } # END inner SKIP block +} # END outer SKIP block - # XXX I know this is wrong on Win32 but is it correct on any others? - # XXX also should it be %Config or %PConfig - TODO: - { - local $TODO = "Not Currently Implemented"; - - pasm_output_is( <<'CODE', $Config{osvers}, "sysinfo OS version string" ); - sysinfo_s_ic S1, 5 - print S1 -end -CODE - - pasm_output_is( <<'CODE', $Config{osvers}, "sysinfo OS version number string" ); - sysinfo_s_ic S1, 6 - print S1 -end -CODE - } -} - SKIP: { skip "Requires a lot of work to find out the correct answer", 1;