aboutsummaryrefslogtreecommitdiff
path: root/libc/ci/docker/x86_64-rumprun-netbsd
diff options
context:
space:
mode:
authorDaniel Mueller <deso@posteo.net>2020-04-04 14:39:19 -0700
committerDaniel Mueller <deso@posteo.net>2020-04-04 14:39:19 -0700
commitd0d9683df8398696147e7ee1fcffb2e4e957008c (patch)
tree4baa76712a76f4d072ee3936c07956580b230820 /libc/ci/docker/x86_64-rumprun-netbsd
parent203e691f46d591a2cc8acdfd850fa9f5b0fb8a98 (diff)
downloadnitrocli-d0d9683df8398696147e7ee1fcffb2e4e957008c.tar.gz
nitrocli-d0d9683df8398696147e7ee1fcffb2e4e957008c.tar.bz2
Remove vendored dependencies
While it appears that by now we actually can get successful builds without Cargo insisting on Internet access by virtue of using the --frozen flag, maintaining vendored dependencies is somewhat of a pain point. This state will also get worse with upcoming changes that replace argparse in favor of structopt and pull in a slew of new dependencies by doing so. Then there is also the repository structure aspect, which is non-standard due to the way we vendor dependencies and a potential source of confusion. In order to fix these problems, this change removes all the vendored dependencies we have. Delete subrepo argparse/:argparse Delete subrepo base32/:base32 Delete subrepo cc/:cc Delete subrepo cfg-if/:cfg-if Delete subrepo getrandom/:getrandom Delete subrepo lazy-static/:lazy-static Delete subrepo libc/:libc Delete subrepo nitrokey-sys/:nitrokey-sys Delete subrepo nitrokey/:nitrokey Delete subrepo rand/:rand
Diffstat (limited to 'libc/ci/docker/x86_64-rumprun-netbsd')
-rw-r--r--libc/ci/docker/x86_64-rumprun-netbsd/Dockerfile10
-rw-r--r--libc/ci/docker/x86_64-rumprun-netbsd/runtest.rs55
2 files changed, 0 insertions, 65 deletions
diff --git a/libc/ci/docker/x86_64-rumprun-netbsd/Dockerfile b/libc/ci/docker/x86_64-rumprun-netbsd/Dockerfile
deleted file mode 100644
index a486d05..0000000
--- a/libc/ci/docker/x86_64-rumprun-netbsd/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM mato/rumprun-toolchain-hw-x86_64
-USER root
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends \
- qemu
-ENV PATH=$PATH:/rust/bin \
- CARGO_TARGET_X86_64_RUMPRUN_NETBSD_RUNNER=/tmp/runtest
-
-ADD docker/x86_64-rumprun-netbsd/runtest.rs /tmp/
-ENTRYPOINT ["sh", "-c", "rustc /tmp/runtest.rs -o /tmp/runtest && exec \"$@\"", "--"]
diff --git a/libc/ci/docker/x86_64-rumprun-netbsd/runtest.rs b/libc/ci/docker/x86_64-rumprun-netbsd/runtest.rs
deleted file mode 100644
index 7e96fbf..0000000
--- a/libc/ci/docker/x86_64-rumprun-netbsd/runtest.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use std::env;
-use std::process::{Command, Stdio};
-use std::sync::mpsc;
-use std::thread;
-use std::time::Duration;
-use std::io::{BufRead, BufReader, Read};
-
-fn main() {
- assert_eq!(env::args().len(), 2);
-
- let status = Command::new("rumprun-bake")
- .arg("hw_virtio")
- .arg("/tmp/libc-test.img")
- .arg(env::args().nth(1).unwrap())
- .status()
- .expect("failed to run rumprun-bake");
- assert!(status.success());
-
- let mut child = Command::new("qemu-system-x86_64")
- .arg("-nographic")
- .arg("-vga").arg("none")
- .arg("-m").arg("64")
- .arg("-kernel").arg("/tmp/libc-test.img")
- .stdout(Stdio::piped())
- .stderr(Stdio::piped())
- .spawn()
- .expect("failed to spawn qemu");
-
- let mut stdout = child.stdout.take().unwrap();
- let mut stderr = child.stderr.take().unwrap();
- let (tx, rx) = mpsc::channel();
- let tx2 = tx.clone();
- let t1 = thread::spawn(move || find_ok(&mut stdout, tx));
- let t2 = thread::spawn(move || find_ok(&mut stderr, tx2));
-
- let res = rx.recv_timeout(Duration::new(5, 0));
- child.kill().unwrap();
- t1.join().unwrap();
- t2.join().unwrap();
-
- if res.is_err() {
- panic!("didn't find success");
- }
-}
-
-fn find_ok(input: &mut Read, tx: mpsc::Sender<()>) {
- for line in BufReader::new(input).lines() {
- let line = line.unwrap();
- println!("{}", line);
- if (line.starts_with("PASSED ") && line.contains(" tests")) ||
- line.starts_with("test result: ok"){
- tx.send(()).unwrap();
- }
- }
-}