A more appropriate test failure error

Author: martin-hughes

src/aml/mod.rs

@@ -3337,4 +3337,12 @@ pub enum AmlError {
     /// This is emitted to signal that the library does not support the requested behaviour. This
     /// should eventually never be emitted.
     LibUnimplemented,
+
+    /// The library has given a response the host does not understand, or the host is otherwise
+    /// unable to continue operating the library correctly. The specific reason is given in the
+    /// contained String.
+    ///
+    /// This variant is set by the host, not by the library, and can be used when it is convenient
+    /// not to construct a more complex error type around [`AmlError`].
+    HostError(String),
 }

tools/aml_test_tools/src/lib.rs

@@ -325,14 +325,14 @@ where
             match *result {
                 Object::Integer(0) => Ok(()),
                 Object::Integer(other) => {
-                    error!("Test _MAIN returned non-zero exit code: {}", other);
-                    // TODO: wrong error - this should probs return a more complex err type
-                    Err(AmlError::NoCurrentOp)
+                    let e = format!("Test _MAIN returned non-zero exit code: {}", other);
+                    error!("{}", e);
+                    Err(AmlError::HostError(e))
                 }
                 _ => {
-                    error!("Test _MAIN returned unexpected object type: {}", *result);
-                    // TODO: wrong error
-                    Err(AmlError::NoCurrentOp)
+                    let e = format!("Test _MAIN returned unexpected object type: {}", *result);
+                    error!("{}", e);
+                    Err(AmlError::HostError(e))
                 }
             }
         } else {