[zorg] r217512 - Fix lit arg passing for libcxx-libcxxabi-singlethreaded-x86_64-linux-debian

[Jonathan Roelofs]

I think this might still be broken, but I can't tell why yet...

http://lab.llvm.org:8011/builders/libcxx-libcxxabi-singlethreaded-x86_64-linux-debian/builds/5/steps/test.libcxxabi/logs/stdio 
shows:

 > [100%] Running libcxxabi tests
 > Usage: lit.py [options] {file-or-path}
 >
 > lit.py: error: no such option: -

Dimitri, any chance you could post the file 
test/CMakeFiles/check-libcxx.dir/build.make from this build? I'm specifically 
interested in the line after the one containing "Running libcxx tests".


TIA,

Jon

On 9/10/14 9:48 AM, Jonathan Roelofs wrote:
> Author: jroelofs
> Date: Wed Sep 10 10:48:09 2014
> New Revision: 217512
>
> URL: http://llvm.org/viewvc/llvm-project?rev=217512&view=rev
> Log:
> Fix lit arg passing for libcxx-libcxxabi-singlethreaded-x86_64-linux-debian
>
> http://reviews.llvm.org/D5273
>
> Modified:
>      zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py
>
> Modified: zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py
> URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py?rev=217512&r1=217511&r2=217512&view=diff
> ==============================================================================
> --- zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py (original)
> +++ zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py Wed Sep 10 10:48:09 2014
> @@ -71,9 +71,9 @@ def getLibcxxAndAbiBuilder(f=None, env={
>           env['CXXFLAGS'] = (env.get('CXXFLAGS', '') +
>                              ' -D_LIBCPP_HAS_NO_MONOTONIC_CLOCK')
>
> -    litTestArgs = ''
> +    litTestArgs = '-sv --show-unsupported --show-xfail'
>       if additional_features:
> -        litTestArgs = ('--param=additional_features=' +
> +        litTestArgs += (' --param=additional_features=' +
>                          ','.join(additional_features))
>
>       # Nuke/remake build directory and run CMake
> @@ -85,8 +85,9 @@ def getLibcxxAndAbiBuilder(f=None, env={
>           haltOnFailure=True, workdir=src_root))
>
>       f.addStep(buildbot.steps.shell.ShellCommand(
> -        name='cmake', command=['cmake', src_root], haltOnFailure=True,
> -        workdir=build_path, env=env))
> +        name='cmake', command=['cmake', src_root,
> +                               '-DLLVM_LIT_ARGS="'+litTestArgs+'"'],
> +        haltOnFailure=True, workdir=build_path, env=env))
>
>       # Build libcxxabi
>       jobs_flag = properties.WithProperties('-j%(jobs)s')
> @@ -100,14 +101,13 @@ def getLibcxxAndAbiBuilder(f=None, env={
>                 haltOnFailure=True, workdir=build_path))
>
>       # Test libc++abi
> -    lit_flags = properties.WithProperties("LIT_ARGS=%s" % litTestArgs)
>       f.addStep(buildbot.steps.shell.ShellCommand(
> -        name='test.libcxxabi', command=['make', lit_flags, 'check-libcxxabi'],
> +        name='test.libcxxabi', command=['make', 'check-libcxxabi'],
>           workdir=build_path))
>
>       # Test libc++
>       f.addStep(buildbot.steps.shell.ShellCommand(
> -        name='test.libcxx', command=['make', lit_flags, 'check-libcxx'],
> +        name='test.libcxx', command=['make', 'check-libcxx'],
>           workdir=build_path))
>
>       return f
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>

-- 
Jon Roelofs
jonathan at codesourcery.com
CodeSourcery / Mentor Embedded