diff --git a/tests/Makefile b/tests/Makefile index 4b3a10019..63c819f9c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -12,7 +12,6 @@ run_OBJ := \ $(subst .cpp,.o,$(wildcard $(d)tests/*.cpp)) \ $(d)support/main.o \ $(d)support/util.o \ - $(d)support/util_unix.o \ $(TOP)lib/libaegisub.a \ $(TOP)lib/libuniversalchardet.a \ $(GTEST_FILE).o diff --git a/tests/support/util.h b/tests/support/util.h index a08542163..a2713b48f 100644 --- a/tests/support/util.h +++ b/tests/support/util.h @@ -15,9 +15,6 @@ // Aegisub Project http://www.aegisub.org/ #include -#include - -#include namespace util { bool compare(std::string const& file1, std::string const& file2); diff --git a/tests/support/util_unix.cpp b/tests/support/util_unix.cpp deleted file mode 100644 index 0bb2cfd61..000000000 --- a/tests/support/util_unix.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 2010, Amar Takhar -// -// Permission to use, copy, modify, and distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice appear in all copies. -// -// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// $Id$ - -/// @file util_unix.cpp -/// @brief Common utilities used in tests. -/// @ingroup util unix - -#include -#include "util.h" - -namespace util { - -void remove(const std::string& file) { - unlink(file.c_str()); -} - -} // namespace util - diff --git a/tests/support/util_windows.cpp b/tests/support/util_windows.cpp deleted file mode 100644 index 7f6acfce5..000000000 --- a/tests/support/util_windows.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) 2010, Amar Takhar -// -// Permission to use, copy, modify, and distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice appear in all copies. -// -// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// $Id$ - -/// @file util_windows.cpp -/// @brief Common utilities used in tests. -/// @ingroup util windows - -#include -#include "util.h" - -namespace util { - -void remove(const std::string& file) { - _unlink(file.c_str()); -} - -} // namespace util - -