Imported Upstream version 1.4.16+git20130912

NPTest.pm

@@ -460,6 +460,7 @@ sub SaveCache
   my( $dataDumper ) = new Data::Dumper( [ \%CACHE ] );
 
   $dataDumper->Terse(1);
+  $dataDumper->Sortkeys(1);
 
   print $fileHandle $dataDumper->Dump();
 
@@ -615,7 +616,10 @@ sub testCmd {
 	my $class = shift;
 	my $command = shift or die "No command passed to testCmd";
 	my $object = $class->new;
-	
+
+	local $SIG{'ALRM'} = sub { die("timeout in command: $command"); };
+	alarm(120); # no test should take longer than 120 seconds
+
 	my $output = `$command`;
 	$object->return_code($? >> 8);
 	$_ = $? & 127;
@@ -625,6 +629,8 @@ sub testCmd {
 	chomp $output;
 	$object->output($output);
 
+	alarm(0);
+
 	my ($pkg, $file, $line) = caller(0);
 	print "Testing: $command", $/;
 	if ($ENV{'NPTEST_DEBUG'}) {