Merge pull request #540 from libgit2/clay-rename

Rename the Clay test suite to Clar

.gitignore

-/tests-clay/clay.h
-/tests-clay/clay_main.c
+/tests-clar/clar.h
+/tests-clar/clar_main.c
 /apidocs
 /trash-*.exe
 /libgit2.pc

CMakeLists.txt

@@ -48,7 +48,7 @@ SET(INSTALL_INC include CACHE PATH "Where to install headers to.")
 OPTION (BUILD_SHARED_LIBS "Build Shared Library (OFF for Static)" ON)
 OPTION (THREADSAFE "Build libgit2 as threadsafe" OFF)
 OPTION (BUILD_TESTS "Build Tests" ON)
-OPTION (BUILD_CLAY "Build Tests using the Clay suite" OFF)
+OPTION (BUILD_CLAR "Build Tests using the Clar suite" OFF)
 OPTION (TAGS "Generate tags" OFF)
 
 # Platform specific compilation flags
@@ -142,32 +142,32 @@ IF (BUILD_TESTS)
 	ADD_TEST(libgit2_test libgit2_test)
 ENDIF ()
 
-IF (BUILD_CLAY)
+IF (BUILD_CLAR)
 	FIND_PACKAGE(PythonInterp REQUIRED)
 
-	SET(CLAY_FIXTURES "${CMAKE_CURRENT_SOURCE_DIR}/tests/resources/")
-	SET(CLAY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tests-clay")
-	ADD_DEFINITIONS(-DCLAY_FIXTURE_PATH=\"${CLAY_FIXTURES}\")
+	SET(CLAR_FIXTURES "${CMAKE_CURRENT_SOURCE_DIR}/tests/resources/")
+	SET(CLAR_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tests-clar")
+	ADD_DEFINITIONS(-DCLAR_FIXTURE_PATH=\"${CLAR_FIXTURES}\")
 
-	INCLUDE_DIRECTORIES(${CLAY_PATH})
-	FILE(GLOB_RECURSE SRC_TEST ${CLAY_PATH}/*/*.c ${CLAY_PATH}/clay_helpers.c ${CLAY_PATH}/testlib.c)
+	INCLUDE_DIRECTORIES(${CLAR_PATH})
+	FILE(GLOB_RECURSE SRC_TEST ${CLAR_PATH}/*/*.c ${CLAR_PATH}/clar_helpers.c ${CLAR_PATH}/testlib.c)
 
 	ADD_CUSTOM_COMMAND(
-		OUTPUT ${CLAY_PATH}/clay_main.c ${CLAY_PATH}/clay.h
-		COMMAND ${PYTHON_EXECUTABLE} clay -vtap .
-		DEPENDS ${CLAY_PATH}/clay ${SRC_TEST}
-		WORKING_DIRECTORY ${CLAY_PATH}
+		OUTPUT ${CLAR_PATH}/clar_main.c ${CLAR_PATH}/clar.h
+		COMMAND ${PYTHON_EXECUTABLE} clar -vtap .
+		DEPENDS ${CLAR_PATH}/clar ${SRC_TEST}
+		WORKING_DIRECTORY ${CLAR_PATH}
 	)
-	ADD_EXECUTABLE(libgit2_clay ${SRC} ${CLAY_PATH}/clay_main.c ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP})
-	TARGET_LINK_LIBRARIES(libgit2_clay ${CMAKE_THREAD_LIBS_INIT})
+	ADD_EXECUTABLE(libgit2_clar ${SRC} ${CLAR_PATH}/clar_main.c ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP})
+	TARGET_LINK_LIBRARIES(libgit2_clar ${CMAKE_THREAD_LIBS_INIT})
 	IF (WIN32)
-		TARGET_LINK_LIBRARIES(libgit2_clay ws2_32)
+		TARGET_LINK_LIBRARIES(libgit2_clar ws2_32)
 	ELSEIF (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
-		TARGET_LINK_LIBRARIES(libgit2_clay socket nsl)
+		TARGET_LINK_LIBRARIES(libgit2_clar socket nsl)
 	ENDIF ()
 
 	ENABLE_TESTING()
-	ADD_TEST(libgit2_clay libgit2_clay)
+	ADD_TEST(libgit2_clar libgit2_clar)
 ENDIF ()
 
 IF (TAGS)

tests-clay/README.md → tests-clar/README.md

-Writing Clay tests for libgit2
+Writing Clar tests for libgit2
 ==============================
 
-For information on the Clay testing framework and a detailed introduction
+For information on the Clar testing framework and a detailed introduction
 please visit:
 
-https://github.com/tanoku/clay
+https://github.com/tanoku/clar
 
 
 * Write your modules and tests. Use good, meaningful names.
 
 * Make sure you actually build the tests by setting:
 
-        cmake -DBUILD_CLAY=ON build/
+        cmake -DBUILD_CLAR=ON build/
 
 * Test:
 
-        ./build/libgit2_clay
+        ./build/libgit2_clar
 
 * Make sure everything is fine.
 

tests-clay/attr/file.c → tests-clar/attr/file.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "attr_file.h"
 
 #define get_rule(X) ((git_attr_rule *)git_vector_get(&file->rules,(X)))

tests-clay/attr/lookup.c → tests-clar/attr/lookup.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "attr_file.h"
 
 void test_attr_lookup__simple(void)

tests-clay/attr/repo.c → tests-clar/attr/repo.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "fileops.h"
 #include "git2/attr.h"
 

tests-clay/buf/basic.c → tests-clar/buf/basic.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "buffer.h"
 
 static const char *test_string = "Have you seen that? Have you seeeen that??";
@@ -26,4 +26,4 @@ void test_buf_basic__printf(void)
 	cl_assert(git_buf_oom(&buf2) == 0);
 	cl_assert(strcmp(git_buf_cstr(&buf2), "shoop da 23 woop 42") == 0);
 	git_buf_free(&buf2);
-}
\ No newline at end of file
+}

tests-clay/clay_helpers.c → tests-clar/clar_helpers.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "posix.h"
 
-void clay_on_init(void)
+void clar_on_init(void)
 {
 	git_threads_init();
 }
 
-void clay_on_shutdown(void)
+void clar_on_shutdown(void)
 {
 	git_threads_shutdown();
 }

tests-clay/clay_libgit2.h → tests-clar/clar_libgit2.h

-#ifndef __CLAY_LIBGIT2__
-#define __CLAY_LIBGIT2__
+#ifndef __CLAR_LIBGIT2__
+#define __CLAR_LIBGIT2__
 
-#include "clay.h"
+#include "clar.h"
 #include <git2.h>
 #include "common.h"
 
 /**
- * Special wrapper for `clay_must_pass` that passes
+ * Special wrapper for `clar_must_pass` that passes
  * the last library error as the test failure message.
  *
  * Use this wrapper around all `git_` library calls that
@@ -15,11 +15,11 @@
 #define cl_git_pass(expr) do { \
 	git_clearerror(); \
 	if ((expr) != GIT_SUCCESS) \
-		clay__assert(0, __FILE__, __LINE__, "Function call failed: " #expr, git_lasterror(), 1); \
+		clar__assert(0, __FILE__, __LINE__, "Function call failed: " #expr, git_lasterror(), 1); \
 	} while(0)
 
 /**
- * Wrapper for `clay_must_fail` -- this one is
+ * Wrapper for `clar_must_fail` -- this one is
  * just for consistency. Use with `git_` library
  * calls that are supposed to fail!
  */
@@ -38,7 +38,7 @@ GIT_INLINE(void) cl_assert_strequal_internal(
 	if (!match) {
 		char buf[4096];
 		snprintf(buf, 4096, "'%s' != '%s'", a, b);
-		clay__assert(0, file, line, buf, err, 1);
+		clar__assert(0, file, line, buf, err, 1);
 	}
 }
 

tests-clay/config/add.c → tests-clar/config/add.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 void test_config_add__initialize(void)
 {

tests-clay/config/new.c → tests-clar/config/new.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 #include "filebuf.h"
 #include "fileops.h"

tests-clay/config/read.c → tests-clar/config/read.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 void test_config_read__simple_read(void)
 {

tests-clay/config/stress.c → tests-clar/config/stress.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 #include "filebuf.h"
 #include "fileops.h"

tests-clay/config/write.c → tests-clar/config/write.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 void test_config_write__initialize(void)
 {

tests-clay/core/buffer.c → tests-clar/core/buffer.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "buffer.h"
 
 #define TESTSTR "Have you seen that? Have you seeeen that??"

tests-clay/core/dirent.c → tests-clar/core/dirent.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "fileops.h"
 
 typedef struct name_data {

tests-clay/core/filebuf.c → tests-clar/core/filebuf.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "filebuf.h"
 
 /* make sure git_filebuf_open doesn't delete an existing lock */

tests-clay/core/hex.c → tests-clar/core/hex.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "util.h"
 
 void test_core_hex__fromhex(void)

tests-clay/core/oid.c → tests-clar/core/oid.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 static git_oid id;
 const char *str_oid = "ae90f12eea699729ed24555e40b9fd669da12a12";
@@ -15,4 +15,4 @@ void test_core_oid__streq(void)
 
 	cl_assert(git_oid_streq(&id, "deadbeef") == GIT_ENOTOID);
 	cl_assert(git_oid_streq(&id, "I'm not an oid.... :)") == GIT_ENOTOID);
-}
\ No newline at end of file
+}

tests-clay/core/path.c → tests-clar/core/path.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include <fileops.h>
 
 static void

tests-clay/core/rmdir.c → tests-clar/core/rmdir.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "fileops.h"
 
 static const char *empty_tmp_dir = "test_gitfo_rmdir_recurs_test";

tests-clay/core/string.c → tests-clar/core/string.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 /* compare prefixes */
 void test_core_string__0(void)

tests-clay/core/strtol.c → tests-clar/core/strtol.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 void test_core_strtol__int32(void)
 {

tests-clay/core/vector.c → tests-clar/core/vector.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "vector.h"
 
 /* initial size of 1 would cause writing past array bounds */

tests-clay/index/read_tree.c → tests-clar/index/read_tree.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "posix.h"
 
 /* Test that reading and writing a tree is a no-op */

tests-clay/index/rename.c → tests-clar/index/rename.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "posix.h"
 
 void test_index_rename__single_file(void)

tests-clay/network/createremotethenload.c → tests-clar/network/createremotethenload.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 static git_remote *_remote;
 static git_repository *_repo;

tests-clay/network/remotelocal.c → tests-clar/network/remotelocal.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "transport.h"
 #include "buffer.h"
 #include "path.h"

tests-clay/network/remotes.c → tests-clar/network/remotes.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 static git_remote *_remote;
 static git_repository *_repo;

tests-clay/object/commit/commitstagedfile.c → tests-clar/object/commit/commitstagedfile.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "posix.h"
 
 static git_repository *repo;

tests-clay/object/raw/chars.c → tests-clar/object/raw/chars.c

 
-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 #include "odb.h"
 

tests-clay/object/raw/compare.c → tests-clar/object/raw/compare.c

 
-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 #include "odb.h"
 

tests-clay/object/raw/convert.c → tests-clar/object/raw/convert.c

 
-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 #include "odb.h"
 

tests-clay/object/raw/fromstr.c → tests-clar/object/raw/fromstr.c

 
-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 #include "odb.h"
 

tests-clay/object/raw/hash.c → tests-clar/object/raw/hash.c

 
-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 #include "odb.h"
 #include "hash.h"

tests-clay/object/raw/short.c → tests-clar/object/raw/short.c

 
-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 #include "odb.h"
 #include "hash.h"

tests-clay/object/raw/size.c → tests-clar/object/raw/size.c

 
-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 #include "odb.h"
 

tests-clay/object/raw/type2string.c → tests-clar/object/raw/type2string.c

 
-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 #include "odb.h"
 #include "hash.h"

tests-clay/object/tree/diff.c → tests-clar/object/tree/diff.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "tree.h"
 #include "repository.h"
 

tests-clay/object/tree/frompath.c → tests-clar/object/tree/frompath.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 static git_repository *repo;
 const char *tree_with_subtrees_oid = "ae90f12eea699729ed24555e40b9fd669da12a12";

tests-clay/odb/loose.c → tests-clar/odb/loose.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "odb.h"
 #include "posix.h"
 #include "loose_data.h"

tests-clay/odb/packed.c → tests-clar/odb/packed.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "odb.h"
 #include "pack_data.h"
 

tests-clay/odb/sorting.c → tests-clar/odb/sorting.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "git2/odb_backend.h"
 #include "odb.h"
 

tests-clay/refs/crashes.c → tests-clar/refs/crashes.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 void test_refs_crashes__double_free(void)
 {

tests-clay/repo/getters.c → tests-clar/repo/getters.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 
 void test_repo_getters__initialize(void)
 {

tests-clay/repo/init.c → tests-clar/repo/init.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "fileops.h"
 
 enum repo_mode {

tests-clay/repo/open.c → tests-clar/repo/open.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "posix.h"
 
 void test_repo_open__bare_empty_repo(void)

tests-clay/status/ignore.c → tests-clar/status/ignore.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "fileops.h"
 #include "git2/attr.h"
 

tests-clay/status/single.c → tests-clar/status/single.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "posix.h"
 
 static void

tests-clay/status/worktree.c → tests-clar/status/worktree.c

-#include "clay_libgit2.h"
+#include "clar_libgit2.h"
 #include "fileops.h"
 #include "ignore.h"
 #include "status_data.h"