minijail0_cli_unittest: fix random crashes/failures am: 9741372f23
am: 0d40743b67
Change-Id: I5c89f0d0a8c359d639540c6a104fd6da5dd9aa9c
diff --git a/minijail0_cli_unittest.cc b/minijail0_cli_unittest.cc
index a774d55..2427a01 100644
--- a/minijail0_cli_unittest.cc
+++ b/minijail0_cli_unittest.cc
@@ -42,8 +42,10 @@
// as it parses things (which is normally permissible with argv).
int parse_args_(const std::vector<std::string>& argv, int *exit_immediately,
ElfType *elftype) {
- // Make sure we reset the getopts state when scanning a new argv.
- optind = 1;
+ // Make sure we reset the getopts state when scanning a new argv. Setting
+ // this to 0 is a GNU extension, but AOSP/BSD also checks this (as an alias
+ // to their "optreset").
+ optind = 0;
std::vector<const char *> pargv;
pargv.push_back("minijail0");