1 files changed, 89 insertions, 17 deletions
diff --git a/libbuild2/build/script/parser+diag.test.testscript b/libbuild2/build/script/parser+diag.test.testscript
index 30eb859..504c9a4 100644
--- a/libbuild2/build/script/parser+diag.test.testscript
+++ b/libbuild2/build/script/parser+diag.test.testscript
@@ -19,17 +19,99 @@ $* <<EOI >>EOO
   name: echo
   EOO
 
-: diag
+: name-operation
 :
-$* <<EOI >>~%EOO%
-  echo abc
-  cat abc
-  diag copy >= $>
-  cp <- $>
+$* <<EOI >>EOO
+  a = 'b'
   EOI
-  %diag: copy >= .+file\{driver\.\}%
+  name: update
   EOO
 
+: preamble
+:
+{
+  : disambiguate
+  :
+  $* <<EOI >>~%EOO%
+    echo abc | set v
+    cat abc | set v
+    diag copy >= $>
+    cp <- $>
+    EOI
+    echo abc | set v
+    cat abc | set v
+    %diag: copy >= .+file\{driver\.\}%
+    EOO
+
+  : name
+  :
+  $* <<EOI >>EOO
+    n = foo
+    diag copy $n
+    cp $n $>
+    EOI
+    diag: copy foo
+    EOO
+
+  : quoted
+  :
+  $* <<EOI >'diag: foo'
+    f = foo
+    diag "$f"
+    EOI
+
+  : quoted-eval
+  :
+  $* <<EOI >'diag: foo'
+    f = foo
+    diag "($f)"
+    EOI
+
+  : temp_dir
+  :
+  {
+    test.options += -t
+
+    : no
+    :
+    $* <<EOI >false
+      f = foo
+      diag $f
+      f = $~/f
+      foo "$f"
+      EOI
+
+    : no-depdb
+    :
+    $* <<EOI >false
+      f = $~/f
+      depdb hash "$f"
+      diag $f
+      f = $~/f
+      foo "$f"
+      EOI
+
+    : yes
+    :
+    $* <<EOI >true
+      f = $~/f
+      diag $f
+      foo $f
+      EOI
+
+    : yes-depdb
+    :
+    $* <<EOI >true
+      f = $~/f
+      depdb hash "$f"
+      f = $~/t
+      diag $f
+      f = $~/f
+      foo "$f"
+      EOI
+  }
+}
+
 : ambiguity
 :
 {
@@ -67,16 +149,6 @@ $* <<EOI >>~%EOO%
       info: consider specifying it explicitly with the 'diag' recipe attribute
       info: or provide custom low-verbosity diagnostics with the 'diag' builtin
     EOE
-
-  : none
-  :
-  $* <<EOI 2>>EOE != 0
-    a = 'b'
-    EOI
-    buildfile:11:1: error: unable to deduce low-verbosity script diagnostics name
-      info: consider specifying it explicitly with the 'diag' recipe attribute
-      info: or provide custom low-verbosity diagnostics with the 'diag' builtin
-    EOE
 }
 
 : inside-if