diff options
| author | natrixaeria <upezu@student.kit.edu> | 2019-11-15 20:03:23 +0100 |
|---|---|---|
| committer | natrixaeria <upezu@student.kit.edu> | 2019-11-15 20:03:23 +0100 |
| commit | fe488737784da2196b84dbc22b658bf12a5f58f9 (patch) | |
| tree | 1e4b39c0668380407e21bb35484a172410eb4d7a /kernel/.cargo | |
| parent | 57850278fd6540dbf485db38d6819cbf40e0adf0 (diff) | |
| parent | 8ee78510c4e182c636bd1ae851e38124985952fd (diff) | |
Merge branch 'master' of dennis:/var/repos/uff-os
Diffstat (limited to 'kernel/.cargo')
| -rw-r--r-- | kernel/.cargo/config | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/.cargo/config b/kernel/.cargo/config index b74f97c..992b819 100644 --- a/kernel/.cargo/config +++ b/kernel/.cargo/config @@ -2,5 +2,8 @@ target = "x86_64-uff.json" rustflags = ["-Clink-arg=-r","-Clink-dead-code"] -[target.'cfg(target_os = "none")'] -runner = "./run test -test" +[target.'cfg(all(target_os = "none", feature = "testing_qemu"))'] +runner = "./run -test -serial" + +[target.'cfg(all(target_os = "none", not(feature = "testing_qemu")))'] +runner = "./run -test" |