regress: avoid hang in emergency flow cache test
Fixed HP and OVS scripts parsing of command line options to avoid hanging forever in "test_emergency_table"
This commit is contained in:
1 parent
4154ed4eb5
commit
5843bdce91
4 files changed
+21
-12
No files matched your search
@@ -14,10 +14,12 @@ my $of_hp_listener;
|
||||
my $of_hp_community;
|
||||
|
||||
# Process command line options
|
||||
unless ( GetOptions( "map=s" => \$mapFile, ) ) {
|
||||
print "unrecognized option\n";
|
||||
exit 1;
|
||||
}
|
||||
# Don't fail on unrecognised options, those failures are tricky
|
||||
# to diagnose. For example projects/controller_disconnect sets --emerg
|
||||
# Jean II
|
||||
Getopt::Long::Configure( 'pass_through' );
|
||||
GetOptions( "map=s" => \$mapFile, );
|
||||
Getopt::Long::Configure( 'default' );
|
||||
|
||||
# If not specified on command line, use environment variable.
|
||||
# Try specific first, then try generic - Jean II
|
||||
|
||||
@@ -15,10 +15,12 @@ my $mapFile;
|
||||
# Jean II
|
||||
|
||||
# Process command line options
|
||||
unless ( GetOptions( "map=s" => \$mapFile, ) ) {
|
||||
print "unrecognized option\n";
|
||||
exit 1;
|
||||
}
|
||||
# Don't fail on unrecognised options, those failures are tricky
|
||||
# to diagnose. For example projects/controller_disconnect sets --emerg
|
||||
# Jean II
|
||||
Getopt::Long::Configure( 'pass_through' );
|
||||
GetOptions( "map=s" => \$mapFile, );
|
||||
Getopt::Long::Configure( 'default' );
|
||||
|
||||
# If not specified on command line, use enviroment variable.
|
||||
# Try specific first, then try generic - Jean II
|
||||
|
||||
@@ -15,10 +15,12 @@ my $mapFile;
|
||||
# Jean II
|
||||
|
||||
# Process command line options
|
||||
unless ( GetOptions( "map=s" => \$mapFile, ) ) {
|
||||
print "unrecognized option\n";
|
||||
exit 1;
|
||||
}
|
||||
# Don't fail on unrecognised options, those failures are tricky
|
||||
# to diagnose. For example projects/controller_disconnect sets --emerg
|
||||
# Jean II
|
||||
Getopt::Long::Configure( 'pass_through' );
|
||||
GetOptions( "map=s" => \$mapFile, );
|
||||
Getopt::Long::Configure( 'default' );
|
||||
|
||||
# If not specified on command line, use enviroment variable.
|
||||
# Try specific first, then try generic - Jean II
|
||||
|
||||
@@ -38,6 +38,9 @@ push @ARGV, "--less_ports";
|
||||
# Don't bother with QoS currently, it's broken...
|
||||
push @ARGV, "--no_slicing";
|
||||
|
||||
# The bother with emergency flow table tests, it's not supported...
|
||||
push @ARGV, "--no_emerg";
|
||||
|
||||
# Don't forget to configure the OVS_ROOT environment variable
|
||||
# Jean II
|
||||
|
||||
|
||||
Reference in new issue
Block a user