generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow unknown flags in test_main.cc.

Browse Source 
Adds AllowCommandLineParsing to allow us to ignore "--no-sandbox" given
by new TSanV2 bots. Not ignoring this flag prevents the test from
running on this machine. Also removing unnecessary asserts that clutter
code.

BUG=
TEST=Locally running video_engine_tests with --no-sandbox.
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2178004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4679 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-09-05 10:27:46 +00:00
parent 36439bf906
commit 7e1bf318bf
1 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
webrtc/video_engine/test/common/flags.cc
View File

@ -10,59 +10,36 @@
#include "webrtc/video_engine/test/common/flags.h" #include "webrtc/video_engine/test/common/flags.h"
#include <assert.h>
#include "gflags/gflags.h" #include "gflags/gflags.h"
namespace webrtc { namespace webrtc {
namespace test { namespace test {
namespace flags { namespace flags {
bool flags_are_init = false; void Init(int* argc, char*** argv) {
// AllowCommandLineParsing allows us to ignore flags passed on to us by
void Init(int* argc, char ***argv) { // Chromium build bots without having to explicitly disable them.
assert(!flags_are_init); google::AllowCommandLineReparsing();
google::ParseCommandLineFlags(argc, argv, true); google::ParseCommandLineFlags(argc, argv, true);
// stuff;
flags_are_init = true;
} }
DEFINE_int32(width, 640, "Video width."); DEFINE_int32(width, 640, "Video width.");
size_t Width() { size_t Width() { return static_cast<size_t>(FLAGS_width); }
assert(flags_are_init);
return static_cast<size_t>(FLAGS_width);
}
DEFINE_int32(height, 480, "Video height."); DEFINE_int32(height, 480, "Video height.");
size_t Height() { size_t Height() { return static_cast<size_t>(FLAGS_height); }
assert(flags_are_init);
return static_cast<size_t>(FLAGS_height);
}
DEFINE_int32(fps, 30, "Frames per second."); DEFINE_int32(fps, 30, "Frames per second.");
int Fps() { int Fps() { return static_cast<int>(FLAGS_fps); }
assert(flags_are_init);
return static_cast<int>(FLAGS_fps);
}
DEFINE_int32(min_bitrate, 50, "Minimum video bitrate."); DEFINE_int32(min_bitrate, 50, "Minimum video bitrate.");
size_t MinBitrate() { size_t MinBitrate() { return static_cast<size_t>(FLAGS_min_bitrate); }
assert(flags_are_init);
return static_cast<size_t>(FLAGS_min_bitrate);
}
DEFINE_int32(start_bitrate, 300, "Video starting bitrate."); DEFINE_int32(start_bitrate, 300, "Video starting bitrate.");
size_t StartBitrate() { size_t StartBitrate() { return static_cast<size_t>(FLAGS_start_bitrate); }
assert(flags_are_init);
return static_cast<size_t>(FLAGS_start_bitrate);
}
DEFINE_int32(max_bitrate, 800, "Maximum video bitrate."); DEFINE_int32(max_bitrate, 800, "Maximum video bitrate.");
size_t MaxBitrate() { size_t MaxBitrate() { return static_cast<size_t>(FLAGS_max_bitrate); }
assert(flags_are_init);
return static_cast<size_t>(FLAGS_max_bitrate);
}
} // flags } // flags
} // test } // test
} // webrtc } // webrtc