# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1423251146 28800
# Node ID 8cd798884d606c08a3a7d875c5232b997cc6c96c
# Parent  9ee881900cf5b7f0f3f18616f020826b63b25d09
generateZshCompletions should include diagnostic VM options and supoprt completion for more mx commands

diff -r 9ee881900cf5 -r 8cd798884d60 mx/mx_graal.py
--- a/mx/mx_graal.py	Fri Feb 06 11:31:59 2015 -0800
+++ b/mx/mx_graal.py	Fri Feb 06 11:32:26 2015 -0800
@@ -2280,7 +2280,7 @@
     complt += '\t(args)\n'
     # TODO: improve matcher: if mx args are given, this doesn't work
     complt += '\t\tcase $line[1] in\n'
-    complt += '\t\t\t(vm)\n'
+    complt += '\t\t\t(vm | vmg | vmfg | unittest | jmh | dacapo | scaladacapo | specjvm2008 | specjbb2013 | specjbb2005)\n'
     complt += '\t\t\t\tnoglob \\\n'
     complt += '\t\t\t\t\t_arguments -s -S \\\n'
     complt += _appendOptions("graal", r"G\:")
@@ -2347,7 +2347,7 @@
 
     # gather graal options
     output = StringIO.StringIO()
-    vm(['-XX:-BootstrapGraal', '-G:+PrintFlags' if optionType == "graal" else '-XX:+PrintFlagsWithComments'],
+    vm(['-XX:-BootstrapGraal', '-XX:+UnlockDiagnosticVMOptions', '-G:+PrintFlags' if optionType == "graal" else '-XX:+PrintFlagsWithComments'],
        vm="graal",
        vmbuild="optimized",
        nonZeroIsFatal=False,