Fix tests broken by OptionValidator changes.

[zturner]

Summary

Fix tests broken by the OptionValidator changes.

The getopt library has a structure called option (lowercase). We have a structure called Option (uppercase). previously the two structures had exactly the same definitions, and we were doing a C-style cast of an Option* to an option*. C-style casts don't bother to warn you when you cast to unrelated types, but in the original OptionValidator patch I modified the definition of Option.

This patch fixes the errors by building an array of option structures and filling it out the correct way before passing it to the getopt library.

Note: So that the focus remains on the fix for the test failures, this patch does not include all the content of the original patch which was reverted. If this change is approved, it will go in as a single commit consisting of the original path (which has been reverted) combined with this patch.

[zturner]

Added lldb-commits to subscribers

[tfiala]

Working on this now.

[tfiala]

The Linux build and tests look fine with this change here layered on top of a revert of r212543 via:
svn merge -c -212543 .

I'm waiting on the MacOSX build and test, should be done within 10 minutes.

[tfiala]

I've done the test run on MacOSX. I am seeing 7 new failures there. I'm rerunning the tests once again to see if it was something intermittent.

[tfiala]

I'm getting these failures on MacOSX:

Failing Tests (17)
FAIL: LLDB (suite) :: TestAbbreviations.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestCommandHistory.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestDataFormatterObjC.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestDataFormatterStdMap.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestDataFormatterStdVector.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestProcessLaunch.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestCreateAfterAttach.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestHelp.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestRegisterVariables.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestStepAndBreakpoints.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestObjCMethods.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestHiddenIvars.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestObjCDynamicSBType.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestObjCDynamicValue.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestRealDefinition.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestTargetAPI.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)
FAIL: LLDB (suite) :: TestSettings.py (Darwin tfiala-macbookpro.roam.corp.google.com 13.2.0 Darwin Kernel Version 13.2.0: Thu Apr 17 23:03:13 PDT 2014; root:xnu-2422.100.13~1/RELEASE_X86_64 x86_64 i386)

11 of them were pre-existing (see lldb-dev mails earlier).

Trying this one one other machine to see if it's something specific to tfiala-macbookpro (OSX 10.9.3, Xcode 6 Beta).

[zturner]

Fixes the rest of the test failures. These were tricky to catch because they were surfacing as core dumps, and when a test core dumps it does not generate a test log file. This needs to be fixed in the test suite separately.

[tfiala]

Trying this sometime this morning.

[tfiala]

This ran clean on the Linux build. When you do the svn merge -c -212543 . command to undo 212543, don't miss the new option that was added (I think "count") when you do the fixup - otherwise we'll lose that new option.

Came back clean on MacOSX too (well, the stock 11 failed I get are still there).

[zturner]

Closed by commit rL212628 (authored by @zturner).

lldb/trunk/source/Host/common/OptionParser.cpp

 //===-- source/Host/common/OptionParser.cpp ---------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Host/OptionParser.h"
 #include "lldb/Host/HostGetOpt.h"
+#include "lldb/lldb-private-types.h"
+
+#include <vector>
 
 using namespace lldb_private;
 
 void
 OptionParser::Prepare()
 {
 #ifdef __GLIBC__
     optind = 0;

 
 int
 OptionParser::Parse (int argc,
                      char * const argv [],
                      const char *optstring,
                      const Option *longopts,
                      int *longindex)
 {
-    return getopt_long_only(argc, argv, optstring, (const option*)longopts, longindex);
+    std::vector<option> opts;
+    while (longopts->definition != nullptr)
+    {
+        option opt;
+        opt.flag = longopts->flag;
+        opt.val = longopts->val;
+        opt.name = longopts->definition->long_option;
+        opt.has_arg = longopts->definition->option_has_arg;
+        opts.push_back(opt);
+        ++longopts;
+    }
+    opts.push_back(option());
+    return getopt_long_only(argc, argv, optstring, &opts[0], longindex);
 }
 
 char*
 OptionParser::GetOptionArgument()
 {
     return optarg;
 }
 

lldb/trunk/source/Interpreter/OptionGroupBoolean.cpp

OptionGroupBoolean::OptionGroupBoolean (uint32_t usage_mask,
                                         bool default_value,
                                         bool no_argument_toggle_default) :
     m_value (default_value, default_value)
 {
     m_option_definition.usage_mask = usage_mask;
     m_option_definition.required = required;
     m_option_definition.long_option = long_option;
     m_option_definition.short_option = short_option;
+    m_option_definition.validator = nullptr;
     m_option_definition.option_has_arg = no_argument_toggle_default ? OptionParser::eNoArgument : OptionParser::eRequiredArgument;
     m_option_definition.enum_values = nullptr;
     m_option_definition.completion_type = 0;
     m_option_definition.argument_type = eArgTypeBoolean;
     m_option_definition.usage_text = usage_text;
 }
 
 OptionGroupBoolean::~OptionGroupBoolean ()

lldb/trunk/source/Interpreter/OptionGroupFile.cpp

OptionGroupFile::OptionGroupFile (uint32_t usage_mask,
                                   lldb::CommandArgumentType argument_type,
                                   const char *usage_text) :
     m_file ()
 {
     m_option_definition.usage_mask = usage_mask;
     m_option_definition.required = required;
     m_option_definition.long_option = long_option;
     m_option_definition.short_option = short_option;
+    m_option_definition.validator = nullptr;
     m_option_definition.option_has_arg = OptionParser::eRequiredArgument;
     m_option_definition.enum_values = nullptr;
     m_option_definition.completion_type = completion_type;
     m_option_definition.argument_type = argument_type;
     m_option_definition.usage_text = usage_text;
 }
 
 OptionGroupFile::~OptionGroupFile ()
OptionGroupFileList::OptionGroupFileList (uint32_t usage_mask,
                                           lldb::CommandArgumentType argument_type,
                                           const char *usage_text) :
     m_file_list ()
 {
     m_option_definition.usage_mask = usage_mask;
     m_option_definition.required = required;
     m_option_definition.long_option = long_option;
     m_option_definition.short_option = short_option;
+    m_option_definition.validator = nullptr;
     m_option_definition.option_has_arg = OptionParser::eRequiredArgument;
     m_option_definition.enum_values = nullptr;
     m_option_definition.completion_type = completion_type;
     m_option_definition.argument_type = argument_type;
     m_option_definition.usage_text = usage_text;
 }
 
 OptionGroupFileList::~OptionGroupFileList ()

lldb/trunk/source/Interpreter/OptionGroupString.cpp

OptionGroupString::OptionGroupString (uint32_t usage_mask,
                                       const char *usage_text,
                                       const char *default_value) :
     m_value (default_value, default_value)
 {
     m_option_definition.usage_mask = usage_mask;
     m_option_definition.required = required;
     m_option_definition.long_option = long_option;
     m_option_definition.short_option = short_option;
+    m_option_definition.validator = nullptr;
     m_option_definition.option_has_arg = OptionParser::eRequiredArgument;
     m_option_definition.enum_values = nullptr;
     m_option_definition.completion_type = completion_type;
     m_option_definition.argument_type = argument_type;
     m_option_definition.usage_text = usage_text;
 }
 
 OptionGroupString::~OptionGroupString ()

lldb/trunk/source/Interpreter/OptionGroupUInt64.cpp

OptionGroupUInt64::OptionGroupUInt64 (uint32_t usage_mask,
                                         const char *usage_text,
                                         uint64_t default_value) :
     m_value (default_value, default_value)
 {
     m_option_definition.usage_mask = usage_mask;
     m_option_definition.required = required;
     m_option_definition.long_option = long_option;
     m_option_definition.short_option = short_option;
+    m_option_definition.validator = nullptr;
     m_option_definition.option_has_arg = OptionParser::eRequiredArgument;
     m_option_definition.enum_values = nullptr;
     m_option_definition.completion_type = completion_type;
     m_option_definition.argument_type = argument_type;
     m_option_definition.usage_text = usage_text;
 }
 
 OptionGroupUInt64::~OptionGroupUInt64 ()