regress: --no_barrier to disable barrier tests

Barrier tests can be disabled via the --no_barrier command line arg

Change submitted by: Jean Tourrilhes <jt@hpl.hp.com>

regress/lib/Perl5/Test/RegressTest.pm

@@ -67,6 +67,7 @@ my $sendDelay;
 my $baseIdle;
 my $ignoreByteCount;
 my $noSlicing;
+my $noBarrier;
 my $lessPorts;
 
 sub run_regress_test {
@@ -98,6 +99,7 @@ sub run_regress_test {
 			"base_idle=s"		=> \$baseIdle,
 			"ignore_byte_count"	=> \$ignoreByteCount,
 			"no_slicing"		=> \$noSlicing,
+			"no_barrier"		=> \$noBarrier,
 			"less_ports"            => \$lessPorts
 		)
 		and ( $help eq '' )
@@ -587,6 +589,10 @@ sub runTest {
 	if ( defined($noSlicing) ) {
 		$args .= " --no_slicing";
 	}
+	# Some platforms can not do barrier - Jean II
+	if ( defined($noBarrier) ) {
+		$args .= " --no_barrier";
+	}
 
 	# Don't do all ports on some platforms, it's slow and useless...
 	if ( defined($lessPorts) ) {

regress/lib/Perl5/Test/TestLib.pm

@@ -232,6 +232,7 @@ sub nftest_init {
 			"num_ports=i",
 			"common-st-args=s",
 			"no_slicing",
+			"no_barrier",
 			"less_ports"
 			)
 		) 

regress/projects/black_box/regress/test_barrier/run.pl

@@ -7,6 +7,7 @@ use OF::Includes;
 sub my_test {
     my ($sock, $options_ref) = @_;
 
+    if ( not defined( $$options_ref{'no_barrier'} ) ) {
 	my $in_port = $$options_ref{'port_base'};
 	my $out_port = $in_port + 1;
 
@@ -45,6 +46,7 @@ sub my_test {
 	# RUOK?
 	send_get_config_request($ofp, $sock, 0xcafe2009);
 	wait_for_get_config_reply($ofp, $sock, 0xcafe2009);
+    }
 }
 
 run_black_box_test(\&my_test, \@ARGV);

regress/projects/black_box/regress/tests.txt

@@ -70,7 +70,7 @@ test_queue_config/run.pl
 ## These assume that there is a queue with queue_id=1 at port 1.
 ## Uncomment if your setup supports this.
 ## Should work OK with the reference implementation
-test_queue_stats/run.pl
+#test_queue_stats/run.pl
 test_queue_forward/run.pl
 
 ## Unusual Data