-test_event_wildcard 1 'tp:tp*'
-test_event_wildcard 1 '*'
-test_event_wildcard 1 'tp:tptest*'
-test_event_wildcard 0 'tp:abc*'
+diag "Test UST wildcard"
+
+if [ ! -x "$TESTAPP_BIN" ]; then
+ BAIL_OUT "No UST nevents binary detected."
+fi
+
+EVENT_NAME="tp:tptest"
+
+test_event_wildcard ust 1 'tp:tp*'
+test_event_wildcard ust 1 '*'
+test_event_wildcard ust 1 'tp:tptest*'
+test_event_wildcard ust 0 'tp:abc*'
+
+test_event_wildcard_fail ust 'tp:*tp'
+test_event_wildcard_fail ust 'tp:tp**'
+test_event_wildcard_fail ust '*tp:tp*'
+
+
+if [ "$(id -u)" == "0" ]; then
+ isroot=1
+else
+ isroot=0
+fi