Merge "SWDEV-1 - Fix getopt for options that don't have colon" into amd-staging

opencl/tests/ocltst/env/getopt.cpp

@@ -42,7 +42,8 @@ int getopt(int argc, char *const argv[], const char *optstring) {
       return '?';
     }
     optarg = argv[optind];
-    optind++;
   }
+
+  optind++;
   return opt;
 }