[Notes] [Git][BuildStream/buildstream][jjardon/use_freedesktop-sdk_18_08] WIP



Title: GitLab

Javier Jardón pushed to branch jjardon/use_freedesktop-sdk_18_08 at BuildStream / buildstream

Commits:

2 changed files:

Changes:

  • doc/examples/flatpak-autotools/elements/hello.bst
    ... ... @@ -4,6 +4,9 @@ description: Autotools project
    4 4
     depends:
    
    5 5
     - base.bst
    
    6 6
     
    
    7
    +variables:
    
    8
    +  prefix: '/app'
    
    9
    +
    
    7 10
     sources:
    
    8 11
     - kind: local
    
    9 12
       path: files/src

  • tests/examples/flatpak-autotools.py
    ... ... @@ -45,13 +45,13 @@ def test_autotools_build(cli, tmpdir, datafiles):
    45 45
         result = cli.run(project=project, args=['checkout', 'hello.bst', checkout])
    
    46 46
         assert result.exit_code == 0
    
    47 47
     
    
    48
    -    assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
    
    49
    -                               '/usr/share', '/usr/lib/debug',
    
    50
    -                               '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
    
    51
    -                               '/usr/lib/debug/usr/bin/hello',
    
    52
    -                               '/usr/bin/hello', '/usr/share/doc',
    
    53
    -                               '/usr/share/doc/amhello',
    
    54
    -                               '/usr/share/doc/amhello/README'])
    
    48
    +    assert_contains(checkout, ['/app', '/app/lib', '/app/bin',
    
    49
    +                               '/app/share', '/app/lib/debug',
    
    50
    +                               '/app/lib/debug/app', '/app/lib/debug/app/bin',
    
    51
    +                               '/app/lib/debug/app/bin/hello',
    
    52
    +                               '/app/bin/hello', '/app/share/doc',
    
    53
    +                               '/app/share/doc/amhello',
    
    54
    +                               '/app/share/doc/amhello/README'])
    
    55 55
     
    
    56 56
     
    
    57 57
     # Test running an executable built with autotools
    
    ... ... @@ -64,6 +64,6 @@ def test_autotools_run(cli, tmpdir, datafiles):
    64 64
         result = cli.run(project=project, args=['build', 'hello.bst'])
    
    65 65
         assert result.exit_code == 0
    
    66 66
     
    
    67
    -    result = cli.run(project=project, args=['shell', 'hello.bst', '/usr/bin/hello'])
    
    67
    +    result = cli.run(project=project, args=['shell', 'hello.bst', '/app/bin/hello'])
    
    68 68
         assert result.exit_code == 0
    
    69 69
         assert result.output == 'Hello World!\nThis is amhello 1.0.\n'



  • [Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]