[AIX] Split lit test shtest-format into two separate tests and add AIX as UNSUPPORTED for shtest-format-argv0

[ShuhongL]

Summary

lit test shtest-format.py fails on AIX because one of the subtest of shtest-format requires the tool [ to be installed under the system PATH. For AIX, [ is only available as a shell builtin and does not present as an executable file under PATH. Hence, split the original shtest-format into two separate test files and added AIX as UNSUPPORTED for the test using [ .

[hubert.reinterpretcast]

llvm/utils/lit/tests/Inputs/shtest-format-argv0/lit.cfg

9

I think there's no use of this substitution in the directory.

llvm/utils/lit/tests/shtest-format-argv0.py

6

Minor nit: "builtin" is a noun here. s/shell-builtin/shell builtin/;

[ShuhongL]

@hubert.reinterpretcast thanks, updated the comment and removed config substitution

[hubert.reinterpretcast]

LGTM with minor nit.

llvm/utils/lit/tests/shtest-format-argv0.py

7

Minor nit: Missing period at the end of the sentence.

[ShuhongL]

Added missing period in comment

llvm/utils/lit/tests/Inputs/shtest-format-argv0/lit.cfg

+import lit.formats
+config.name = 'shtest-format-argv0'
+config.suffixes = ['.txt']
+config.test_format = lit.formats.ShTest()
+config.test_source_root = None
+config.test_exec_root = None
+config.target_triple = 'x86_64-unknown-unknown'

llvm/utils/lit/tests/lit.cfg

lit_config.warning('Setting a timeout per test not supported. ' + errormsg
                          ' command line argument will not work.')
 
 # When running the lit tests standalone, we want to define the same features
 # that the llvm_config defines. This means that the 'system-windows' feature
 # (and any others) need to match the names in llvm_config for consistency
 if not llvm_config:
   if sys.platform.startswith('win') or sys.platform.startswith('cygwin'):
     config.available_features.add('system-windows')
+  if platform.system() == 'AIX':
+    config.available_features.add('aix')
 
 # For each of lit's internal shell commands ('env', 'cd', 'diff', etc.), put
 # a fake command that always fails at the start of PATH.  This helps us check
 # that we always use lit's internal version rather than some external version
 # that might not be present or behave correctly on all platforms.  Don't do
 # this for 'echo' because an external version is used when it appears in a
 # pipeline.  Don't do this for ':' because it doesn't appear to be a valid file
 # name under Windows.
 test_bin = os.path.join(os.path.dirname(__file__), 'Inputs', 'fake-externals')
 config.environment['PATH'] = os.path.pathsep.join((test_bin,
                                                    config.environment['PATH']))

llvm/utils/lit/tests/shtest-format-argv0.py

 # Check that we route argv[0] as it was written, instead of the resolved
 # path. This is important for some tools, in particular '[' which at least on OS
 # X only recognizes that it is in '['-mode when its argv[0] is exactly
 # '['. Otherwise it will refuse to accept the trailing closing bracket.
 #
-# RUN: [ "A" = "A" ]
+# This test is not supported on AIX since `[` is only available as a shell builtin
+# and is not installed under PATH by default.
+# UNSUPPORTED: aix
+#
+# RUN: %{lit} -j 1 -v %{inputs}/shtest-format-argv0 | FileCheck %s
+
+# CHECK: -- Testing:
+# CHECK: PASS: shtest-format-argv0 :: argv0.txt

llvm/utils/lit/tests/shtest-format.py

 # Check the various features of the ShTest format.
 #
 # RUN: rm -f %t.xml
 # RUN: not %{lit} -j 1 -v %{inputs}/shtest-format --xunit-xml-output %t.xml > %t.out
 # RUN: FileCheck < %t.out %s
 # RUN: FileCheck --check-prefix=XUNIT < %t.xml %s
 
 # END.
 
 # CHECK: -- Testing:
 
-# CHECK: PASS: shtest-format :: argv0.txt
 # CHECK: FAIL: shtest-format :: external_shell/fail.txt
 # CHECK-NEXT: *** TEST 'shtest-format :: external_shell/fail.txt' FAILED ***
 # CHECK: Command Output (stdout):
 # CHECK-NEXT: --
 # CHECK-NEXT: line 1: failed test output on stdout
 # CHECK-NEXT: line 2: failed test output on stdout
 # CHECK: Command Output (stderr):
 # CHECK-NEXT: --

 # CHECK: shtest-format :: external_shell/fail_with_bad_encoding.txt
 # CHECK: shtest-format :: fail.txt
 
 # CHECK: Unexpectedly Passed Tests (1)
 # CHECK: shtest-format :: xpass.txt
 
 # CHECK: Testing Time:
 # CHECK: Unsupported        : 4
-# CHECK: Passed             : 7
+# CHECK: Passed             : 6
 # CHECK: Expectedly Failed  : 4
 # CHECK: Unresolved         : 3
 # CHECK: Failed             : 3
 # CHECK: Unexpectedly Passed: 1
 
 
 # XUNIT: <?xml version="1.0" encoding="UTF-8"?>
 # XUNIT-NEXT: <testsuites>
-# XUNIT-NEXT: <testsuite name="shtest-format" tests="22" failures="7" skipped="4">
-
-# XUNIT: <testcase classname="shtest-format.shtest-format" name="argv0.txt" time="{{[0-9]+\.[0-9]+}}"/>
+# XUNIT-NEXT: <testsuite name="shtest-format" tests="21" failures="7" skipped="4">
 
 # XUNIT: <testcase classname="shtest-format.external_shell" name="fail.txt" time="{{[0-9]+\.[0-9]+}}">
 # XUNIT-NEXT: <failure{{[ ]*}}>
 # XUNIT: </failure>
 # XUNIT-NEXT: </testcase>
 
 
 # XUNIT: <testcase classname="shtest-format.external_shell" name="fail_with_bad_encoding.txt" time="{{[0-9]+\.[0-9]+}}">