Merge pull request #2575 from cgwalters/merge-ostree-rs

Merge ostree-rs into this repository

tests/inst/.gitignore

@@ -0,0 +1,2 @@
+Cargo.lock
+target/

tests/inst/Cargo.toml

@@ -4,6 +4,8 @@ version = "0.1.0"
 authors = ["Colin Walters <walters@verbum.org>"]
 edition = "2018"
 
+[workspace]
+
 [[bin]]
 name = "ostree-test"
 path = "src/insttestmain.rs"

tests/kolainst/Makefile

@@ -12,6 +12,6 @@ all:
 install:
 	install -D -m 0644 -t $(KOLA_TESTDIR) $(LIBSCRIPTS)
 	for x in $(TESTDIRS); do rsync -rlv ./$${x} $(KOLA_TESTDIR)/; done
-	install -D -m 0755 -t $(KOLA_TESTDIR)/nondestructive-rs ../../target/release/ostree-test
+	install -D -m 0755 -t $(KOLA_TESTDIR)/nondestructive-rs ../inst/target/release/ostree-test
 	install -D -m 0644 destructive-stamp.ign $(KOLA_TESTDIR)/destructive-rs/config.ign
 	./install-wrappers.sh destructive-list.txt $(KOLA_TESTDIR)/destructive-rs