Mercurial > paster

changeset 52:ef9f7f40abd1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix
author David Demelier <markand@malikania.fr>
date Mon, 21 Dec 2020 20:32:56 +0100
parents 07b6887d3557
children 55fdcc3e5970
files Makefile tests/test-database.c
diffstat 2 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Dec 21 18:22:44 2020 +0100
+++ b/Makefile	Mon Dec 21 20:32:56 2020 +0100
@@ -79,10 +79,10 @@
 -include ${CORE_DEPS} paster.d pasterd-clean.d
 
 .c.o:
-	${CC} ${MY_CFLAGS} -MMD -Iextern ${CFLAGS} -c $<
+	${CC} ${MY_CFLAGS} ${CFLAGS} -MMD -c $<
 
-.o:
-	${CC} $< -o $@ ${CORE_LIB} ${SQLITE_LIB} ${MY_LDFLAGS} ${LDFLAGS}
+.c:
+	${CC} ${MY_CFLAGS} ${CFLAGS} -MMD $< -o $@ ${CORE_LIB} ${SQLITE_LIB} ${MY_LDFLAGS} ${LDFLAGS}
 
 .in:
 	sed -e "s|@SHAREDIR@|${SHAREDIR}|" \
--- a/tests/test-database.c	Mon Dec 21 18:22:44 2020 +0100
+++ b/tests/test-database.c	Mon Dec 21 20:32:56 2020 +0100
@@ -70,7 +70,7 @@
 		.author = estrdup("unit test"),
 		.language = estrdup("cpp"),
 		.code = estrdup("int main() {}"),
-		.duration = PASTE_HOUR,
+		.duration = PASTE_DURATION_HOUR,
 		.visible = true
 	};
 
@@ -85,7 +85,7 @@
 	GREATEST_ASSERT_STR_EQ(pastes[0].author, "unit test");
 	GREATEST_ASSERT_STR_EQ(pastes[0].language, "cpp");
 	GREATEST_ASSERT_STR_EQ(pastes[0].code, "int main() {}");
-	GREATEST_ASSERT_EQ(pastes[0].duration, PASTE_HOUR);
+	GREATEST_ASSERT_EQ(pastes[0].duration, PASTE_DURATION_HOUR);
 	GREATEST_ASSERT(pastes[0].visible);
 	GREATEST_PASS();
 }
@@ -101,7 +101,7 @@
 		.author = estrdup("unit test"),
 		.language = estrdup("cpp"),
 		.code = estrdup("int main() {}"),
-		.duration = PASTE_HOUR,
+		.duration = PASTE_DURATION_HOUR,
 		.visible = false
 	};
 
@@ -121,7 +121,7 @@
 	struct paste pastes[3];
 	size_t max = 3;
 	struct paste pastie = {
-		.duration = PASTE_HOUR,
+		.duration = PASTE_DURATION_HOUR,
 		.visible = true
 	};
 
@@ -153,7 +153,7 @@
 		GREATEST_ASSERT_STR_EQ(pastes[i].language, "cpp");
 		GREATEST_ASSERT_STR_EQ(pastes[i].code,
 		    bprintf("int main() { return %d; }", expected[i]));
-		GREATEST_ASSERT_EQ(pastes[i].duration, PASTE_HOUR);
+		GREATEST_ASSERT_EQ(pastes[i].duration, PASTE_DURATION_HOUR);
 		GREATEST_ASSERT(pastes[i].visible);
 	};
 
@@ -167,7 +167,7 @@
 	struct paste pastes[3];
 	size_t max = 3;
 	struct paste pastie = {
-		.duration = PASTE_HOUR,
+		.duration = PASTE_DURATION_HOUR,
 		.visible = true
 	};
 
@@ -199,7 +199,7 @@
 		GREATEST_ASSERT_STR_EQ(pastes[i].language, "cpp");
 		GREATEST_ASSERT_STR_EQ(pastes[i].code,
 		    bprintf("int main() { return %d; }", expected[i]));
-		GREATEST_ASSERT_EQ(pastes[i].duration, PASTE_HOUR);
+		GREATEST_ASSERT_EQ(pastes[i].duration, PASTE_DURATION_HOUR);
 		GREATEST_ASSERT(pastes[i].visible);
 	};
 
@@ -225,7 +225,7 @@
 		.author = estrdup("unit test"),
 		.language = estrdup("cpp"),
 		.code = estrdup("int main() {}"),
-		.duration = PASTE_HOUR,
+		.duration = PASTE_DURATION_HOUR,
 		.visible = false
 	};
 	struct paste new = { 0 };
@@ -276,7 +276,7 @@
 			.author = estrdup("markand"),
 			.language = estrdup("cpp"),
 			.code = estrdup("int main(void) {}"),
-			.duration = PASTE_HOUR,
+			.duration = PASTE_DURATION_HOUR,
 			.visible = true
 		},
 		{
@@ -284,7 +284,7 @@
 			.author = estrdup("markand"),
 			.language = estrdup("shell"),
 			.code = estrdup("f() {}"),
-			.duration = PASTE_HOUR,
+			.duration = PASTE_DURATION_HOUR,
 			.visible = true
 		},
 		{
@@ -292,7 +292,7 @@
 			.author = estrdup("NiReaS"),
 			.language = estrdup("python"),
 			.code = estrdup("f: pass"),
-			.duration = PASTE_HOUR,
+			.duration = PASTE_DURATION_HOUR,
 			.visible = true
 		},
 	};
@@ -318,7 +318,7 @@
 	GREATEST_ASSERT_STR_EQ(searched[0].author, "markand");
 	GREATEST_ASSERT_STR_EQ(searched[0].language, "cpp");
 	GREATEST_ASSERT_STR_EQ(searched[0].code, "int main(void) {}");
-	GREATEST_ASSERT_EQ(searched[0].duration, PASTE_HOUR);
+	GREATEST_ASSERT_EQ(searched[0].duration, PASTE_DURATION_HOUR);
 	GREATEST_ASSERT(searched[0].visible);
 	GREATEST_PASS();
 }
@@ -332,7 +332,7 @@
 		.author = estrdup("markand"),
 		.language = estrdup("cpp"),
 		.code = estrdup("int main(void) {}"),
-		.duration = PASTE_HOUR,
+		.duration = PASTE_DURATION_HOUR,
 		.visible = true
 	};
 	size_t max = 1;
@@ -368,7 +368,7 @@
 		.author = estrdup("anonymous"),
 		.language = estrdup("nohighlight"),
 		.code = estrdup("I love you, honey"),
-		.duration = PASTE_HOUR,
+		.duration = PASTE_DURATION_HOUR,
 		.visible = false
 	};
 	size_t max = 1;
@@ -433,7 +433,7 @@
 			.author = estrdup("NiReaS"),
 			.language = estrdup("python"),
 			.code = estrdup("f: pass"),
-			.duration = PASTE_HOUR,
+			.duration = PASTE_DURATION_HOUR,
 			.visible = true
 		},
 	};
@@ -463,7 +463,7 @@
 	GREATEST_ASSERT_STR_EQ(searched.author, "NiReaS");
 	GREATEST_ASSERT_STR_EQ(searched.language, "python");
 	GREATEST_ASSERT_STR_EQ(searched.code, "f: pass");
-	GREATEST_ASSERT_EQ(searched.duration, PASTE_HOUR);
+	GREATEST_ASSERT_EQ(searched.duration, PASTE_DURATION_HOUR);
 	GREATEST_ASSERT(searched.visible);
 	GREATEST_PASS();
 }