Merge remote-tracking branch 'aosp/upstream-master' into mymerge

The version of shflags we have now includes a file with an erroneous
LGPL license header even after the author relicensed under Apache2.

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: manual build
Test: treehugger

Change-Id: Ifc31394445d94248473d60b011fa76f66985e0b4

1 files changed, 0 insertions, 287 deletions

diff --git a/test_results/1.0.3/Solaris-5.11-snv_77.txt b/test_results/1.0.3/Solaris-5.11-snv_77.txt
deleted file mode 100644
index 79969fc..0000000
--- a/test_results/1.0.3/Solaris-5.11-snv_77.txt
+++ /dev/null
@@ -1,287 +0,0 @@
-#------------------------------------------------------------------------------
-# System data
-#
-
-# test run info
-shells="/bin/sh /bin/bash /bin/dash /bin/ksh /bin/pdksh /bin/zsh"
-tests=" shflags_test_defines.sh shflags_test_parsing.sh shflags_test_private.sh shflags_test_public.sh"
-
-# system info
-$ date
-Sat Apr 25 12:20:26 GMT 2009
-$ uname -mprsv
-SunOS 5.11 snv_77 i86pc i386
-
-
-#------------------------------------------------------------------------------
-# Running the test suite with /bin/sh
-#
-shell name: sh
-shell version: unknown
-
---- Executing the 'defines' test suite ---
-testFlagsDefine
-testBoolean
-testFloat
-testInteger
-testString
-testShortNameLength
-testFlagNameIsReserved
-
-Ran 7 tests.
-
-OK
-
---- Executing the 'parsing' test suite ---
-test:WARN Standard version of getopt found. Enhanced tests will be skipped.
-testGetoptStandard
-testGetoptEnhanced
-testValidBooleanShort
-testValidBooleanLong
-testValidFloats
-testInvalidFloats
-testValidIntegers
-testInvalidIntegers
-testValidStrings
-testMultipleFlags
-testSingleNonFlagArg
-testMultipleNonFlagArgs
-testMultipleNonFlagStringArgsWithSpaces
-testFlagsWithEquals
-testComplicatedCommandLineStandard
-testComplicatedCommandLineEnhanced
-
-Ran 16 tests.
-
-OK (skipped=104)
-
---- Executing the 'private' test suite ---
-testGetFlagInfo
-testItemInList
-testColumns
-testValidateBoolean
-testValidateFloat
-testValidateInteger
-
-Ran 6 tests.
-
-OK
-
---- Executing the 'public' test suite ---
-test:WARN Standard version of getopt found. Enhanced tests will be skipped.
-testHelp
-testStandardHelpOutput
-testEnhancedHelpOutput
-testNoHelp
-
-Ran 4 tests.
-
-OK (skipped=6)
-
-
-#------------------------------------------------------------------------------
-# Running the test suite with /bin/bash
-#
-shell name: bash
-shell version: 3.2.25(1)-release
-
---- Executing the 'defines' test suite ---
-testFlagsDefine
-testBoolean
-testFloat
-testInteger
-testString
-testShortNameLength
-testFlagNameIsReserved
-
-Ran 7 tests.
-
-OK
-
---- Executing the 'parsing' test suite ---
-test:WARN Standard version of getopt found. Enhanced tests will be skipped.
-testGetoptStandard
-testGetoptEnhanced
-testValidBooleanShort
-testValidBooleanLong
-testValidFloats
-testInvalidFloats
-testValidIntegers
-testInvalidIntegers
-testValidStrings
-testMultipleFlags
-testSingleNonFlagArg
-testMultipleNonFlagArgs
-testMultipleNonFlagStringArgsWithSpaces
-testFlagsWithEquals
-testComplicatedCommandLineStandard
-testComplicatedCommandLineEnhanced
-
-Ran 16 tests.
-
-OK (skipped=104)
-
---- Executing the 'private' test suite ---
-testGetFlagInfo
-testItemInList
-testColumns
-testValidateBoolean
-testValidateFloat
-testValidateInteger
-
-Ran 6 tests.
-
-OK
-
---- Executing the 'public' test suite ---
-test:WARN Standard version of getopt found. Enhanced tests will be skipped.
-testHelp
-testStandardHelpOutput
-testEnhancedHelpOutput
-testNoHelp
-
-Ran 4 tests.
-
-OK (skipped=6)
-
-
-#------------------------------------------------------------------------------
-# Running the test suite with /bin/dash
-#
-
-
-#------------------------------------------------------------------------------
-# Running the test suite with /bin/ksh
-#
-shell name: ksh
-shell version: M-11/16/88i M-11/16/88i
-
---- Executing the 'defines' test suite ---
-testFlagsDefine
-testBoolean
-testFloat
-testInteger
-testString
-testShortNameLength
-testFlagNameIsReserved
-
-Ran 7 tests.
-
-OK
-
---- Executing the 'parsing' test suite ---
-test:WARN Standard version of getopt found. Enhanced tests will be skipped.
-testGetoptStandard
-testGetoptEnhanced
-testValidBooleanShort
-testValidBooleanLong
-testValidFloats
-testInvalidFloats
-testValidIntegers
-testInvalidIntegers
-testValidStrings
-testMultipleFlags
-testSingleNonFlagArg
-testMultipleNonFlagArgs
-testMultipleNonFlagStringArgsWithSpaces
-testFlagsWithEquals
-testComplicatedCommandLineStandard
-testComplicatedCommandLineEnhanced
-
-Ran 16 tests.
-
-OK (skipped=104)
-
---- Executing the 'private' test suite ---
-testGetFlagInfo
-testItemInList
-testColumns
-testValidateBoolean
-testValidateFloat
-testValidateInteger
-
-Ran 6 tests.
-
-OK
-
---- Executing the 'public' test suite ---
-test:WARN Standard version of getopt found. Enhanced tests will be skipped.
-testHelp
-testStandardHelpOutput
-testEnhancedHelpOutput
-testNoHelp
-
-Ran 4 tests.
-
-OK (skipped=6)
-
-
-#------------------------------------------------------------------------------
-# Running the test suite with /bin/pdksh
-#
-
-
-#------------------------------------------------------------------------------
-# Running the test suite with /bin/zsh
-#
-shell name: zsh
-shell version: 4.3.4
-
---- Executing the 'defines' test suite ---
-testFlagsDefine
-testBoolean
-testFloat
-testInteger
-testString
-testShortNameLength
-testFlagNameIsReserved
-
-Ran 7 tests.
-
-OK
-
---- Executing the 'parsing' test suite ---
-test:WARN Standard version of getopt found. Enhanced tests will be skipped.
-testGetoptStandard
-testGetoptEnhanced
-testValidBooleanShort
-testValidBooleanLong
-testValidFloats
-testInvalidFloats
-testValidIntegers
-testInvalidIntegers
-testValidStrings
-testMultipleFlags
-testSingleNonFlagArg
-testMultipleNonFlagArgs
-testMultipleNonFlagStringArgsWithSpaces
-testFlagsWithEquals
-testComplicatedCommandLineStandard
-testComplicatedCommandLineEnhanced
-
-Ran 16 tests.
-
-OK (skipped=104)
-
---- Executing the 'private' test suite ---
-testGetFlagInfo
-testItemInList
-testColumns
-testValidateBoolean
-testValidateFloat
-testValidateInteger
-
-Ran 6 tests.
-
-OK
-
---- Executing the 'public' test suite ---
-test:WARN Standard version of getopt found. Enhanced tests will be skipped.
-testHelp
-testStandardHelpOutput
-testEnhancedHelpOutput
-testNoHelp
-
-Ran 4 tests.
-
-OK (skipped=6)