seL4 / projects_libs

Other
6 stars 20 forks source link

Fix for copy paste error #4

Closed ridale closed 4 years ago

ridale commented 4 years ago

Seems that the write function was added twice and read left out

kent-mcleod commented 4 years ago

@ssrg-bamboo test

ssrg-bamboo commented 4 years ago

Hello, I'm a bot! I'll bring this PR into Trustworthy Systems and run some tests

ssrg-bamboo commented 4 years ago

Test results for commit 7e27a23359985fe02af21853f040d568e76e44eb

Summary

Test name Result
Code Quality - Check licenses - projects_libs - EXT-ridale-ridale-pl2303-4 SUCCESSFUL
Code Quality - Style - projects_libs - EXT-ridale-ridale-pl2303-4 FAILED

Detailed failure logs

Project Stage Result summary
Code Quality - Style - projects_libs - EXT-ridale-ridale-pl2303-4 Style check on changed files 2 of 3 jobs failed

Job: style Build logs

29-Apr-2020 16:03:33    Build Code Quality - Style - projects_libs - EXT-ridale-ridale-pl2303-4 - style #1 (CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSSTYLEPR-1) started building on agent A local agent 2
29-Apr-2020 16:03:33    I run on the Bamboo server!
29-Apr-2020 16:03:33    Build working directory is /var/atlassian/application-data/bamboo/xml-data/build-dir/151224373/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSSTYLEPR
29-Apr-2020 16:03:33    Executing build Code Quality - Style - projects_libs - EXT-ridale-ridale-pl2303-4 - style #1 (CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSSTYLEPR-1)
29-Apr-2020 16:03:33    Preparing artifact 'code' for use at /var/atlassian/application-data/bamboo/xml-data/build-dir/151224373/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSSTYLEPR/. (location: .)
29-Apr-2020 16:03:33    Artifact 'code' prepared in 33.49 ms at /var/atlassian/application-data/bamboo/xml-data/build-dir/151224373/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSSTYLEPR/./code.tar.gz
29-Apr-2020 16:03:33    Running pre-build action: VCS Version Collector
29-Apr-2020 16:03:33    Starting task 'Untar code' of type 'com.atlassian.bamboo.plugins.scripttask:task.builder.script'
29-Apr-2020 16:03:33    + tar xf code.tar.gz --recursive-unlink
29-Apr-2020 16:03:33    Finished task 'Untar code' with result: Success
29-Apr-2020 16:03:33    Starting task 'Set permissions so Bamboo can cleanup' of type 'com.atlassian.bamboo.plugins.scripttask:task.builder.script'
29-Apr-2020 16:03:33    + chmod -R o+rwx /var/atlassian/application-data/bamboo/xml-data/build-dir/151224373/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSSTYLEPR
29-Apr-2020 16:03:34    Finished task 'Set permissions so Bamboo can cleanup' with result: Success
29-Apr-2020 16:03:34    Starting task 'Check style of changed files' of type 'com.atlassian.bamboo.plugins.scripttask:task.builder.script'
29-Apr-2020 16:03:34    + cd projects_libs
29-Apr-2020 16:03:34    + xargs -d '\n' /var/atlassian/application-data/bamboo/xml-data/build-dir/151224373/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSSTYLEPR/seL4_tools/misc/style.sh
29-Apr-2020 16:03:34    ++ git merge-base 7e27a23359985fe02af21853f040d568e76e44eb 423188069cfe76a0994087b85a1fab2f57bc3d2d
29-Apr-2020 16:03:34    + git diff --name-only 7e27a23359985fe02af21853f040d568e76e44eb 423188069cfe76a0994087b85a1fab2f57bc3d2d
29-Apr-2020 16:03:34    Formatted  libusbdrivers/include/usb/drivers/pl2303.h
29-Apr-2020 16:03:34    + git diff --exit-code
29-Apr-2020 16:03:34    diff --git a/libusbdrivers/include/usb/drivers/pl2303.h b/libusbdrivers/include/usb/drivers/pl2303.h
29-Apr-2020 16:03:34    index 9bfbca2..27962a5 100644
29-Apr-2020 16:03:34    --- a/libusbdrivers/include/usb/drivers/pl2303.h
29-Apr-2020 16:03:34    +++ b/libusbdrivers/include/usb/drivers/pl2303.h
29-Apr-2020 16:03:34    @@ -9,8 +9,7 @@
29-Apr-2020 16:03:34      *
29-Apr-2020 16:03:34      * @TAG(DATA61_BSD)
29-Apr-2020 16:03:34      */
29-Apr-2020 16:03:34    -#ifndef _USB_PL2303_H_
29-Apr-2020 16:03:34    -#define _USB_PL2303_H_
29-Apr-2020 16:03:34    +#pragma once
29-Apr-2020 16:03:34     
29-Apr-2020 16:03:34     #include <platsupport/serial.h>
29-Apr-2020 16:03:34     #include <usb/usb.h>
29-Apr-2020 16:03:34    @@ -18,9 +17,6 @@
29-Apr-2020 16:03:34     int usb_pl2303_bind(usb_dev_t *usb_dev);
29-Apr-2020 16:03:34     
29-Apr-2020 16:03:34     int usb_pl2303_configure(usb_dev_t *udev, uint32_t bps, uint8_t char_size,
29-Apr-2020 16:03:34    +                         enum serial_parity parity, uint8_t stop);
29-Apr-2020 16:03:34     int usb_pl2303_write(usb_dev_t *udev, void *buf, int len);
29-Apr-2020 16:03:34     int usb_pl2303_read(usb_dev_t *udev, void *buf, int len);
29-Apr-2020 16:03:34    -
29-Apr-2020 16:03:34    -#endif /* _USB_PL2303_H_ */
29-Apr-2020 16:03:34    -
29-Apr-2020 16:03:34    Failing task since return code of [/var/atlassian/application-data/bamboo/temp/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSSTYLEPR-1-ScriptBuildTask-6085159688582544023.sh] was 1 while expected 0
29-Apr-2020 16:03:34    Finished task 'Check style of changed files' with result: Failed
29-Apr-2020 16:03:34    Starting task 'Set permissions so Bamboo can cleanup' of type 'com.atlassian.bamboo.plugins.scripttask:task.builder.script'
29-Apr-2020 16:03:34    + chmod -R o+rwx /var/atlassian/application-data/bamboo/xml-data/build-dir/151224373/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSSTYLEPR
29-Apr-2020 16:03:34    Finished task 'Set permissions so Bamboo can cleanup' with result: Success
29-Apr-2020 16:03:34    Starting task 'Run astyle code insights' of type 'com.atlassian.bamboo.plugins.scripttask:task.builder.script'
29-Apr-2020 16:03:34    + cd projects_libs
29-Apr-2020 16:03:34    ++ echo ssh://git@bitbucket.keg.ertos.in.nicta.com.au:7999/sel4proj/projects_libs.git
29-Apr-2020 16:03:34    ++ cut -d/ -f4
29-Apr-2020 16:03:34    + bb_proj=sel4proj
29-Apr-2020 16:03:34    + /scripts/bb_code_insights/create_code_insights.sh astyle sel4proj projects_libs
29-Apr-2020 16:03:34    ++ dirname /scripts/bb_code_insights/create_code_insights.sh
29-Apr-2020 16:03:34    + SCRIPT_DIR=/scripts/bb_code_insights
29-Apr-2020 16:03:34    + BBS_URL=https://bitbucket.ts.data61.csiro.au
29-Apr-2020 16:03:34    + BBS_PROJECT=sel4proj
29-Apr-2020 16:03:34    + BBS_REPO=projects_libs
29-Apr-2020 16:03:34    + REPORT_TO_RUN=astyle
29-Apr-2020 16:03:34    ++ git rev-parse HEAD
29-Apr-2020 16:03:34    + COMMIT_ID=7e27a23359985fe02af21853f040d568e76e44eb
29-Apr-2020 16:03:34    + REPORT_KEY=astyle.report
29-Apr-2020 16:03:34    + set +x
29-Apr-2020 16:03:34    + report_file=astyle_report.json
29-Apr-2020 16:03:34    + annotations_file=astyle_annotations.json
29-Apr-2020 16:03:34    + rm -f astyle_report.json astyle_annotations.json
29-Apr-2020 16:03:34    + /scripts/bb_code_insights/astyle
29-Apr-2020 16:03:37    Reporting on these files:  ['libusbdrivers/include/usb/drivers/pl2303.h']
29-Apr-2020 16:03:37    Reporting the results to BitBucket, but doing so *secretly*, so people don't see the access token
29-Apr-2020 16:03:37    + echo 'Reporting the results to BitBucket, but doing so *secretly*, so people don'\''t see the access token'
29-Apr-2020 16:03:37    + set +x
29-Apr-2020 16:03:37    + '[' -f astyle_report.json ']'
29-Apr-2020 16:03:37    + cat astyle_report.json
29-Apr-2020 16:03:37    + '[' -f astyle_annotations.json ']'
29-Apr-2020 16:03:37    + cat astyle_annotations.json
29-Apr-2020 16:03:37    {"data":[{"title":"Total number of files with incorrect style","value":1},{"title":"Total number of lines with incorrect style","value":6}],"createdDate":1588140217281,"key":"astyle.report","title":"Code style"}{"title": "Code style", "data": [{"title": "Total number of files with incorrect style", "value": 1}, {"title": "Total number of lines with incorrect style", "value": 6}]}{"annotations": [{"path": "libusbdrivers/include/usb/drivers/pl2303.h", "line": 12, "message": "There are 2 line(s) of incorrect style here.", "severity": "HIGH"}, {"path": "libusbdrivers/include/usb/drivers/pl2303.h", "line": 21, "message": "There are 1 line(s) of incorrect style here.", "severity": "HIGH"}, {"path": "libusbdrivers/include/usb/drivers/pl2303.h", "line": 24, "message": "There are 3 line(s) of incorrect style here.", "severity": "HIGH"}]}
29-Apr-2020 16:03:37    Finished task 'Run astyle code insights' with result: Success
29-Apr-2020 16:03:37    Running post build plugin 'NCover Results Collector'
29-Apr-2020 16:03:37    Running post build plugin 'Artifact Copier'
29-Apr-2020 16:03:37    Running post build plugin 'npm Cache Cleanup'
29-Apr-2020 16:03:37    Running post build plugin 'Clover Results Collector'
29-Apr-2020 16:03:37    Running post build plugin 'Docker Container Cleanup'
29-Apr-2020 16:03:37    Successfully removed working directory at '/var/atlassian/application-data/bamboo/xml-data/build-dir/151224373/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSSTYLEPR'
29-Apr-2020 16:03:37    Finalising the build...
29-Apr-2020 16:03:37    Stopping timer.
29-Apr-2020 16:03:37    Build CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSSTYLEPR-1 completed.
29-Apr-2020 16:03:37    Running on server: post build plugin 'NCover Results Collector'
29-Apr-2020 16:03:37    Running on server: post build plugin 'Build Hanging Detection Configuration'
29-Apr-2020 16:03:37    Running on server: post build plugin 'Clover Delta Calculator'
29-Apr-2020 16:03:37    Running on server: post build plugin 'Maven Dependencies Postprocessor'
29-Apr-2020 16:03:37    All post build plugins have finished
29-Apr-2020 16:03:37    Generating build results summary...
29-Apr-2020 16:03:37    Saving build results to disk...
29-Apr-2020 16:03:37    Store variable context...
29-Apr-2020 16:03:37    Indexing build results...
29-Apr-2020 16:03:37    Finished building CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSSTYLEPR-1.

Job: gitlint Build logs

29-Apr-2020 16:03:34    Build Code Quality - Style - projects_libs - EXT-ridale-ridale-pl2303-4 - gitlint #1 (CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSGITLINTPR-1) started building on agent A local agent 1
29-Apr-2020 16:03:34    I run on the Bamboo server!
29-Apr-2020 16:03:34    Build working directory is /var/atlassian/application-data/bamboo/xml-data/build-dir/140083221/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSGITLINTPR
29-Apr-2020 16:03:34    Executing build Code Quality - Style - projects_libs - EXT-ridale-ridale-pl2303-4 - gitlint #1 (CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSGITLINTPR-1)
29-Apr-2020 16:03:34    Preparing artifact 'code' for use at /var/atlassian/application-data/bamboo/xml-data/build-dir/140083221/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSGITLINTPR/. (location: .)
29-Apr-2020 16:03:34    Artifact 'code' prepared in 40.33 ms at /var/atlassian/application-data/bamboo/xml-data/build-dir/140083221/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSGITLINTPR/./code.tar.gz
29-Apr-2020 16:03:34    Running pre-build action: VCS Version Collector
29-Apr-2020 16:03:34    Starting task 'Untar code' of type 'com.atlassian.bamboo.plugins.scripttask:task.builder.script'
29-Apr-2020 16:03:34    + tar xf code.tar.gz --recursive-unlink
29-Apr-2020 16:03:34    Finished task 'Untar code' with result: Success
29-Apr-2020 16:03:34    Starting task 'Set permissions so Bamboo can cleanup' of type 'com.atlassian.bamboo.plugins.scripttask:task.builder.script'
29-Apr-2020 16:03:34    + chmod -R o+rwx /var/atlassian/application-data/bamboo/xml-data/build-dir/140083221/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSGITLINTPR
29-Apr-2020 16:03:34    Finished task 'Set permissions so Bamboo can cleanup' with result: Success
29-Apr-2020 16:03:34    Starting task 'Lint commit messages' of type 'com.atlassian.bamboo.plugins.scripttask:task.builder.script'
29-Apr-2020 16:03:34    + cd projects_libs
29-Apr-2020 16:03:34    + gitlint --commits 423188069cfe76a0994087b85a1fab2f57bc3d2d..7e27a23359985fe02af21853f040d568e76e44eb --config /var/atlassian/application-data/bamboo/xml-data/build-dir/140083221/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSGITLINTPR/seL4_tools/misc/.gitlint
29-Apr-2020 16:03:38    3: B6 Body message is missing
29-Apr-2020 16:03:38    Failing task since return code of [/var/atlassian/application-data/bamboo/temp/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSGITLINTPR-1-ScriptBuildTask-2021688318638744411.sh] was 1 while expected 0
29-Apr-2020 16:03:38    Finished task 'Lint commit messages' with result: Failed
29-Apr-2020 16:03:38    Starting task 'Set permissions so Bamboo can cleanup' of type 'com.atlassian.bamboo.plugins.scripttask:task.builder.script'
29-Apr-2020 16:03:38    + chmod -R o+rwx /var/atlassian/application-data/bamboo/xml-data/build-dir/140083221/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSGITLINTPR
29-Apr-2020 16:03:38    Finished task 'Set permissions so Bamboo can cleanup' with result: Success
29-Apr-2020 16:03:38    Running post build plugin 'NCover Results Collector'
29-Apr-2020 16:03:38    Running post build plugin 'Artifact Copier'
29-Apr-2020 16:03:38    Running post build plugin 'npm Cache Cleanup'
29-Apr-2020 16:03:38    Running post build plugin 'Clover Results Collector'
29-Apr-2020 16:03:38    Running post build plugin 'Docker Container Cleanup'
29-Apr-2020 16:03:38    Successfully removed working directory at '/var/atlassian/application-data/bamboo/xml-data/build-dir/140083221/CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSGITLINTPR'
29-Apr-2020 16:03:38    Finalising the build...
29-Apr-2020 16:03:38    Stopping timer.
29-Apr-2020 16:03:38    Build CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSGITLINTPR-1 completed.
29-Apr-2020 16:03:38    Running on server: post build plugin 'NCover Results Collector'
29-Apr-2020 16:03:38    Running on server: post build plugin 'Build Hanging Detection Configuration'
29-Apr-2020 16:03:38    Running on server: post build plugin 'Clover Delta Calculator'
29-Apr-2020 16:03:38    Running on server: post build plugin 'Maven Dependencies Postprocessor'
29-Apr-2020 16:03:38    All post build plugins have finished
29-Apr-2020 16:03:38    Generating build results summary...
29-Apr-2020 16:03:38    Saving build results to disk...
29-Apr-2020 16:03:38    Store variable context...
29-Apr-2020 16:03:38    Indexing build results...
29-Apr-2020 16:03:38    Finished building CQ-PROJECTSLIBSSTYLE17-PROJECTSLIBSGITLINTPR-1.

This is the most I can report on right now, sorry!

kent-mcleod commented 4 years ago

@ridale thanks, I merged this internally. Note that the commit message linter checks that commit messages follow the criteria listed here: https://docs.sel4.systems/processes/git-conventions.html#commit-messages

ridale commented 4 years ago

Thanks, that's the second time I have failed the commit message, will try to remember, or just tell me to change it.

kent-mcleod commented 4 years ago

Oh, if you leave the PR open GitHub should update it automatically to merged once the CI pushes the commit out