X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=tests%2Ftests-common.sh;h=5ebd2b1389d50b969b72c2c8bb28abe0d1e8baf2;hb=423cd562b3f5acd65bb307a26a5076d5b4005181;hp=cd353efe72acc1889e09a7ac302ec5b3565860c9;hpb=61db93f82eca3fe9f7676355c709c58cc425a6ad;p=wimlib

diff --git a/tests/tests-common.sh b/tests/tests-common.sh
index cd353efe..5ebd2b13 100644
--- a/tests/tests-common.sh
+++ b/tests/tests-common.sh
@@ -31,24 +31,94 @@ get_file_size()
 	fi
 }
 
-imagex()
+wimlib_imagex()
 {
-	echo "imagex $@"
-	if [[ $1 == info || $1 == mountrw ]]; then
-		../../imagex "$@"
-	else
-		../../imagex "$@" > /dev/null
-	fi
+	../../wimlib-imagex "$@"
+}
+
+wimappend()
+{
+	wimlib_imagex append "$@" > /dev/null
+}
+
+wimapply()
+{
+	wimlib_imagex apply "$@" > /dev/null
+}
+
+wimcapture()
+{
+	wimlib_imagex capture "$@" > /dev/null
+}
+
+wimdelete()
+{
+	wimlib_imagex delete "$@" > /dev/null
+}
+
+wimdir()
+{
+	wimlib_imagex dir "$@"
+}
+
+wimexport()
+{
+	wimlib_imagex export "$@" > /dev/null
+}
+
+wimextract()
+{
+	wimlib_imagex extract "$@" > /dev/null
+}
+
+wiminfo()
+{
+	wimlib_imagex info "$@"
+}
+
+wimjoin()
+{
+	wimlib_imagex join "$@" > /dev/null
+}
+
+wimmount()
+{
+	wimlib_imagex mount "$@" > /dev/null
+}
+
+wimmountrw()
+{
+	wimlib_imagex mountrw "$@" > /dev/null
+}
+
+wimoptimize()
+{
+	wimlib_imagex optimize "$@" > /dev/null
+}
+
+wimsplit()
+{
+	wimlib_imagex split "$@" > /dev/null
+}
+
+wimunmount()
+{
+	wimlib_imagex unmount "$@" > /dev/null
+}
+
+wimupdate()
+{
+	wimlib_imagex update "$@" > /dev/null
 }
 
-imagex_raw()
+wimverify()
 {
-	../../imagex "$@"
+	wimlib_imagex verify "$@" > /dev/null
 }
 
 wim_ctype()
 {
-	imagex info $1 | grep Compression | awk '{print $2}'
+	wiminfo $1 | grep Compression | awk '{print $2}'
 }
 
 default_cleanup()