Test generated resolver

Author: amezin

generate-resolver.js

@@ -10,7 +10,7 @@ const {programInvocationName, programArgs, exit} = imports.system;
 async function main() {
     if (programArgs.length < 2) {
         printerr(
-            `Usage: ${programInvocationName} installer.js output-file.js namespace=version namespace=version ...`
+            `Usage: ${programInvocationName} resolver.js output-file.js namespace=version namespace=version ...`
         );
 
         return 1;

tests/install.js

@@ -8,11 +8,11 @@ const {GLib, Gio, GIRepository} = imports.gi;
 const System = imports.system;
 
 async function main() {
-    const resolver = await import('../resolver.js');
+    const resolver = await import(System.programArgs[0]);
     const installer = await import('../installer.js');
     const versions = {};
 
-    for (const arg of System.programArgs) {
+    for (const arg of System.programArgs.slice(1)) {
         const [namespace, version, ...extra] = arg.split('=');
 
         if (!version || extra.length)

tests/sequence.sh

@@ -21,10 +21,18 @@ esac
 
 set -e
 
-[ "$SKIP_GTK3" = "1" ] || dotest ./yes.expect ./install.js Pango=1.0
-[ "$SKIP_GTK3" = "1" ] || dotest ./yes.expect ./install.js Gtk=3.0 Gdk=3.0
-dotest ./yes.expect ./install.js Handy=1
-dotest ./yes.expect ./install.js Gtk=4.0 Gdk=4.0
-dotest ./yes.expect ./install.js Adw=1
-dotest ./yes.expect ./install.js Vte=2.91
-[ "$BROKEN_VTE4" = "1" ] || dotest ./yes.expect ./install.js Vte=3.91
+../generate-resolver.js ../resolver.js /tmp/resolver.min.js Pango=1.0 Gtk=3.0 Gdk=3.0 Handy=1
+
+[ "$SKIP_GTK3" = "1" ] || dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Pango=1.0
+[ "$SKIP_GTK3" = "1" ] || dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Gtk=3.0 Gdk=3.0
+dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Handy=1
+
+../generate-resolver.js ../resolver.js /tmp/resolver.min.js Gtk=4.0 Gdk=4.0 Adw=1
+
+dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Gtk=4.0 Gdk=4.0
+dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Adw=1
+
+../generate-resolver.js ../resolver.js /tmp/resolver.min.js Vte=2.91 Vte=3.91
+
+dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Vte=2.91
+[ "$BROKEN_VTE4" = "1" ] || dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Vte=3.91

tests/sequence2.sh

@@ -21,14 +21,16 @@ esac
 
 set -e
 
-[ "$SKIP_GTK3" = "1" ] || dotest ./yes.expect ./install.js Pango=1.0
-[ "$SKIP_GTK3" = "1" ] || dotest ./yes.expect ./install.js Gdk=3.0
+../generate-resolver.js ../resolver.js /tmp/resolver.min.js Pango=1.0 Gtk=3.0 Gdk=3.0 Gtk=4.0 Gdk=4.0 Handy=1 Adw=1 Vte=2.91 Vte=3.91
 
-dotest ./yes.expect ./install.js Gtk=4.0
-dotest ./yes.expect ./install.js Handy=1 Vte=2.91
+[ "$SKIP_GTK3" = "1" ] || dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Pango=1.0
+[ "$SKIP_GTK3" = "1" ] || dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Gdk=3.0
+
+dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Gtk=4.0
+dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Handy=1 Vte=2.91
 
 if [ "$BROKEN_VTE4" = "1" ]; then
-	dotest ./yes.expect ./install.js Adw=1
+	dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Adw=1
 else
-	dotest ./yes.expect ./install.js Adw=1 Vte=3.91
+	dotest ./yes.expect ./install.js file:///tmp/resolver.min.js Adw=1 Vte=3.91
 fi