X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_test.h;h=94cd0b9ba78a93ac4d716ef8f639d0af4e4418ca;hb=51028779e0a8772091aec5ab96bcf2519cf2f1ad;hp=f28dfdb6c3ea7a2fa0f7c1fe607e1fd2ca6ce641;hpb=9dd9c86a48eae89712ee46197c2817484ac9e6f2;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_test.h b/lib/ecoli_test.h
index f28dfdb..94cd0b9 100644
--- a/lib/ecoli_test.h
+++ b/lib/ecoli_test.h
@@ -1,28 +1,5 @@
-/*
- * Copyright (c) 2016, Olivier MATZ <zer0@droids-corp.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the University of California, Berkeley nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2016, Olivier MATZ <zer0@droids-corp.org>
  */
 
 #ifndef ECOLI_TEST_
@@ -33,7 +10,7 @@
 #include <ecoli_log.h>
 
 struct ec_node;
-enum ec_completed_type;
+enum ec_comp_type;
 
 #define EC_TEST_REGISTER(t)						\
 	static void ec_test_init_##t(void);				\
@@ -85,7 +62,7 @@ int ec_test_check_parse(struct ec_node *node, int expected, ...);
 #define EC_TEST_CHECK(cond, fmt, ...) ({				\
 	int ret_ = 0;							\
 	if (!(cond)) {							\
-		EC_TEST_ERR("(" #cond ") is wrong. "			\
+		EC_TEST_ERR("(" #cond ") is wrong. " fmt		\
 			##__VA_ARGS__);					\
 		ret_ = -1;						\
 	}								\
@@ -101,7 +78,7 @@ int ec_test_check_parse(struct ec_node *node, int expected, ...);
 })
 
 int ec_test_check_complete(struct ec_node *node,
-			enum ec_completed_type type, ...);
+			enum ec_comp_type type, ...);
 
 #define EC_TEST_CHECK_COMPLETE(node, args...) ({			\
 	int ret_ = ec_test_check_complete(node, EC_COMP_FULL, args);	\