Skip to content

Commit ff0c09c

Browse files
committed
rust test
1 parent 1de5187 commit ff0c09c

File tree

2 files changed

+37
-2
lines changed

2 files changed

+37
-2
lines changed

.taskcluster.yml

+36-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ tasks:
1414
setup_pushapkscript: 'apt-get update && apt-get install -y default-jdk &&'
1515
setup_pushsnapscript: 'apt-get update && apt-get install -y libsodium-dev && truncate -s 0 /etc/os-release &&'
1616
setup_pushflatpakscript: 'apt-get update && apt-get install -y gir1.2-ostree-1.0 libgirepository1.0-dev &&'
17+
setup_rust: 'rustup component add clippy rustfmt &&'
1718
in:
1819
# [ <PROJECT NAME>, <PYTHON VERSION>, <SETUP COMMAND>, <DOCKERHUB REPO>]
1920
- ['client', '37', '', '']
@@ -45,6 +46,7 @@ tasks:
4546
- ['treescript', '37', '', '']
4647
- ['treescript', '38', '', 'mozilla/releng-treescript']
4748
- ['pypiscript', '38', '', 'mozilla/releng-pypiscript']
49+
- ['rust', 'rust', '${setup_rust}', '']
4850
# -------------------------------------------------------------------------
4951

5052
HEAD_REV:
@@ -69,6 +71,8 @@ tasks:
6971
$if: 'tasks_for == "github-push" && event.ref[0:11] == "refs/heads/"'
7072
then: '${event.ref[11:]}'
7173
else: 'unknown'
74+
75+
rust_version: 1.43
7276
in:
7377
$flatten:
7478
$map: { "$eval": "PROJECTS" }
@@ -116,7 +120,7 @@ tasks:
116120
in:
117121
$match:
118122
# Run code linting and unit tests for each project
119-
'run_tests == "1"':
123+
'run_tests == "1" && project_name != "rust"':
120124
taskId: '${as_slugid(project_name + python_version)}'
121125
provisionerId: 'releng-t'
122126
workerType: 'linux'
@@ -148,6 +152,37 @@ tasks:
148152
description: 'Code linting and unit tests for ${project_name} on python ${python_version[0]}.${python_version[1]}'
149153
owner: '${OWNER}'
150154
source: '${REPO_URL}/raw/${HEAD_REV}/.taskcluster.yml'
155+
'run_tests == "1" && project_name == "rust"':
156+
taskId: '${as_slugid("rust")}'
157+
provisionerId: 'releng-t'
158+
workerType: 'linux'
159+
created: { $fromNow: '' }
160+
deadline: { $fromNow: '4 hours' }
161+
payload:
162+
maxRunTime: 3600
163+
image: 'rust:${rust_version}'
164+
command:
165+
- sh
166+
- -xce
167+
- >-
168+
cd /tmp &&
169+
wget ${REPO_URL}/archive/${HEAD_REV}.tar.gz &&
170+
tar zxf ${HEAD_REV}.tar.gz &&
171+
mv scriptworker-scripts-${HEAD_REV} /src &&
172+
cd /src && ${setup_command}
173+
cargo test && cargo clippy && cargo fmt --check
174+
metadata:
175+
name:
176+
$let:
177+
test_task_number:
178+
$if: 'dockerhub_repo != ""'
179+
then: '${i+1}.1'
180+
else: '${i+1}'
181+
in:
182+
'${number_prefix}${test_task_number}. ${project_name}: Run rust checks [on ${BRANCH_NAME}]'
183+
description: 'Code linting and unit tests for rust code on rust ${rust_version}'
184+
owner: '${OWNER}'
185+
source: '${REPO_URL}/raw/${HEAD_REV}/.taskcluster.yml'
151186
# Build docker image and (optionally) push to docker hub
152187
'run_tests == "1" && dockerhub_repo != ""':
153188
taskId: '${as_slugid(project_name + "docker_build_and_push")}'

script/macros/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
#![cfg(not(test))] // Work around for rust-lang/rust#62127
12
extern crate proc_macro;
23

34
use proc_macro::TokenStream;
45
use quote::quote;
56

67
#[proc_macro_attribute]
7-
#[cfg(not(test))] // Work around for rust-lang/rust#62127
88
pub fn main(args: TokenStream, item: TokenStream) -> TokenStream {
99
let input = syn::parse_macro_input!(item as syn::ItemFn);
1010
let args = syn::parse_macro_input!(args as syn::AttributeArgs);

0 commit comments

Comments
 (0)