move unit tests to run without "&"

Author: alandekok

src/bin/unit_test_attribute.c

@@ -1517,7 +1517,13 @@ static size_t command_condition_normalise(command_result_t *result, command_file
 		talloc_free(cs);
 		RETURN_OK_WITH_ERROR();
 	}
-	len = xlat_print(&FR_SBUFF_OUT(data, COMMAND_OUTPUT_MAX), head, NULL);
+
+	if ((size_t) slen < inlen) {
+		len = snprintf(data, COMMAND_OUTPUT_MAX, "ERROR passed in %zu, returned %zd", inlen, slen);
+
+	} else {
+		len = xlat_print(&FR_SBUFF_OUT(data, COMMAND_OUTPUT_MAX), head, NULL);
+	}
 
 	talloc_free(head);
 	talloc_free(cs);
@@ -3383,6 +3389,7 @@ static command_file_ctx_t *command_ctx_alloc(TALLOC_CTX *ctx,
 
 	cc->tmpl_rules.attr.list_def = request_attr_request;
 	cc->tmpl_rules.attr.namespace = fr_dict_root(cc->config->dict);
+	cc->tmpl_rules.attr.allow_unresolved = false; /* tests have to use real attributes */
 
 	return cc;
 }

src/lib/server/tmpl_tokenize.c

@@ -3151,7 +3151,7 @@ static ssize_t tmpl_afrom_enum(TALLOC_CTX *ctx, tmpl_t **out, fr_sbuff_t *in,
 			break;
 
 		default:
-			fr_strerror_const("Unexpected text after enum value.  Expected operator");
+			fr_strerror_const("Unexpected text after enum value.");
 			break;
 		}
 
@@ -3384,10 +3384,16 @@ fr_slen_t tmpl_afrom_substr(TALLOC_CTX *ctx, tmpl_t **out,
 
 		/*
 		 *	We can't parse it as anything, that's an error.
+		 *
+		 *	But it may be an enumeration value for an
+		 *	attribute which is loaded later.  In which
+		 *	case we allow parsing the enumeration.
 		 */
 		if (tmpl_require_enum_prefix) {
 			if (!fr_sbuff_is_str_literal(&our_in, "::")) {
-				fr_strerror_const("Failed parsing input");
+				/*
+				 *	Return the error string from parsing the attribute!
+				 */
 				FR_SBUFF_ERROR_RETURN(&our_in);
 			}
 		}
@@ -3419,7 +3425,7 @@ fr_slen_t tmpl_afrom_substr(TALLOC_CTX *ctx, tmpl_t **out,
 				break;
 
 			default:
-				fr_strerror_const("Unexpected text after enum value.  Expected operator");
+				fr_strerror_const("Unexpected text after enum value.");
 				break;
 			}
 

src/lib/unlang/xlat_tokenize.c

@@ -1122,6 +1122,22 @@ ssize_t xlat_print_node(fr_sbuff_t *out, xlat_exp_head_t const *head, xlat_exp_t
 		}
 
 		if (tmpl_is_data(node->vpt)) {
+			/*
+			 *	@todo - until such time as the value
+			 *	box functions print "::" before enum
+			 *	names.
+			 *
+			 *	Arguably it should _always_ print the
+			 *	"::" before enum names, even if the
+			 *	input didn't have "::".  But that's
+			 *	addressed when the prefix is required,
+			 *	OR when the value-box functions are
+			 *	updated.
+			 */
+			if (tmpl_require_enum_prefix && node->vpt->data.literal.enumv &&
+			    (strncmp(node->fmt, "::", 2) == 0)) {
+				FR_SBUFF_IN_STRCPY_LITERAL_RETURN(out, "::");
+			}
 			FR_SBUFF_RETURN(fr_value_box_print_quoted, out, tmpl_value(node->vpt), node->vpt->quote);
 			goto done;
 		}

src/tests/unit/all.mk

@@ -82,6 +82,7 @@ $(BUILD_DIR)/tests/unit/xlat/purify.txt $(filter $(BUILD_DIR)/tests/unit/xlat/co
 #  with the "actual" output.  But only for the "match" command.  Everything is including comments and blank
 #  lines is copied verbatim.
 #
+REQUIRE_ENUM_PREFIX=-S require_enum_prefix=yes
 
 #REWRITE_FLAGS = -w $(BUILD_DIR)/tmp
 #