Storage Framework

Merge lp:~michihenning/storage-framework/ignore-squiggle-files into lp:storage-framework/devel

  1. ignore-squiggle-files
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: James Henstridge
Approved revision: 111
Merged at revision: 112
Proposed branch: lp:~michihenning/storage-framework/ignore-squiggle-files
Merge into: lp:storage-framework/devel
Diff against target: 26 lines (+4/-3)
2 files modified
tests/copyright/check_copyright.sh (+1/-1)
tests/whitespace/CMakeLists.txt (+3/-2)
To merge this branch: bzr merge lp:~michihenning/storage-framework/ignore-squiggle-files
Reviewer Review Type Date Requested Status
James Henstridge Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+320007@code.launchpad.net

Commit message

Ignore backup files ending in ~ in copyright test.
Also ignore noise caused by snapcraft builds for copyright and whitespace tests.

Description of the change

Ignore backup files ending in ~ in copyright test.
Also ignore noise caused by snapcraft builds for copyright and whitespace tests.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:109
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/255/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1786
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1793
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1569
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1569/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1569
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1569/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1569
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1569/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1569
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1569/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1569
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1569/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1569
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1569/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/255/rebuild

review: Approve (continuous-integration)
lp:~michihenning/storage-framework/ignore-squiggle-files updated
110. By Michi Henning

Also ignore noise caused by snapcraft builds for copyright and whitespace tests.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:110
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/258/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1789
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1796
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1572
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1572/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1572
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1572/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1572
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1572/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1572
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1572/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1572
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1572/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1572
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1572/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/258/rebuild

review: Approve (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

It looks like r110 on this branch removed "~$" from the ignore pattern after r109 added it. Was this intentional?

review: Needs Information
lp:~michihenning/storage-framework/ignore-squiggle-files updated
111. By Michi Henning

Added accidentally lost ~$ pattern back into copyright check.

Revision history for this message
Michi Henning (michihenning) wrote :

Thanks for that! Fixed.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:111
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/260/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1803
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1810
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1586
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1586/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1586
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1586/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1586
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1586/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1586
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1586/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1586
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1586/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1586
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1586/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/260/rebuild

review: Approve (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/copyright/check_copyright.sh'
2--- tests/copyright/check_copyright.sh 2016-11-29 06:39:29 +0000
3+++ tests/copyright/check_copyright.sh 2017-03-17 02:42:57 +0000
4@@ -36,7 +36,7 @@
5 source_dir="$1"
6 ignore_dir="${2:-}"
7
8-ignore_pat="\\.sci$|\\.swp$|\\.bzr|debian|qmldir|HACKING|ubsan-suppress|valgrind-suppress|\\.txt$|\\.xml$|\\.in$|\\.dox$|\\.yaml$"
9+ignore_pat="/parts/|/stage/|/prime/|~$|\\.sci$|\\.swp$|\\.bzr|debian|qmldir|HACKING|ubsan-suppress|valgrind-suppress|\\.txt$|\\.xml$|\\.in$|\\.dox$|\\.yaml$"
10
11 #
12 # We don't use the -i option of licensecheck to add ignore_dir to the pattern because Jenkins creates directories
13
14=== modified file 'tests/whitespace/CMakeLists.txt'
15--- tests/whitespace/CMakeLists.txt 2016-04-20 00:53:53 +0000
16+++ tests/whitespace/CMakeLists.txt 2017-03-17 02:42:57 +0000
17@@ -4,6 +4,7 @@
18
19 add_test(whitespace
20 ${CMAKE_CURRENT_SOURCE_DIR}/check_whitespace.py
21- ${CMAKE_SOURCE_DIR}
22- ${CMAKE_BINARY_DIR}
23+ ${CMAKE_SOURCE_DIR}
24+ ${CMAKE_BINARY_DIR}
25+ ${CMAKE_SOURCE_DIR}/parts
26 )

Subscribers

People subscribed via source and target branches

to all changes: