Commit 14db3287 authored by Jürg Billeter's avatar Jürg Billeter
Browse files

projectconfig.yaml: Consistently include directories in split rules 

Most split rules already included the relevant directories themselves in
addition to the directory contents.  Add the missing bin, sbin, and
libexec directories.

This is required to fix tests with the following commit that changes
list_relative_paths() to return all directories.
parent 8c6baf23

buildstream/data/projectconfig.yaml

+6 −0
Original line number Diff line number Diff line
@@ -90,10 +90,16 @@ split-rules: 
  # built element to run, this includes stripped executables

  # and shared libraries by default.

  runtime:

  - |

    %{bindir}

  - |

    %{bindir}/*

  - |

    %{sbindir}

  - |

    %{sbindir}/*

  - |

    %{libexecdir}

  - |

    %{libexecdir}/*

  - |

tests/cachekey/project/elements/build1.expected

+1 −1
Original line number Diff line number Diff line 
dadb8f86874f714b4f6d4c9025332934efb7e85c38f6a68b1267746ae8f43f24
 
b9e1b6a714eb359dbb4b07a32a31c7142f94363c0806a924ca6c46fdbc2cfbea
 
 No newline at end of file

tests/cachekey/project/elements/build2.expected

+1 −1
Original line number Diff line number Diff line 
f81cefce283dd3581ba2fc865ff9c2763119274b114b12edb4e87196cfff8b2a
 
7260eb13fd926f3ef4cbc8bae7397f6ca0f3b37e871c14e1cf47e1d38f6fd68c
 
 No newline at end of file

tests/cachekey/project/elements/compose1.expected

+1 −1
Original line number Diff line number Diff line 
36cb2ac57281343959266e87913eb690f4c68980d7267160ff5f071db778719d
 
 No newline at end of file
 
89fb02d35096d307e8480d25c73845c01ffecc625576a54455c9b29c387c9f16
 
 No newline at end of file

tests/cachekey/project/elements/compose2.expected

+1 −1
Original line number Diff line number Diff line 
30ffe86750a497052f8fc868c47a08644cd579f8e86f59be9b04fa5530b6a9b6
 
 No newline at end of file
 
414bb5723b2b88f3e70445651ad5c94dfe79a5e7e868527c5d74403d2b2c45d4
 
 No newline at end of file