Fixes build failures in Angelscript

2022-05-14 11:59:54 +02:00
parent e32d655d80
commit 50c58a9fd3
12 changed files with 17 additions and 12 deletions
--- a/tests/ScriptTests/Angelscript/BaseScriptClassTests.cpp
+++ b/tests/ScriptTests/Angelscript/BaseScriptClassTests.cpp
@@ -3,7 +3,7 @@
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../TestLibrary/TestLibrary.hpp"
+#include "../../TestLibrary/TestLibrary.hpp"

 #define AS_CLASS(name, contents)                                                                                       \
    {                                                                                                                  \
--- a/tests/ScriptTests/Angelscript/ItemUseScriptTests.cpp
+++ b/tests/ScriptTests/Angelscript/ItemUseScriptTests.cpp
@@ -2,7 +2,7 @@
 #include <doctest.h>
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
-#include "../TestLibrary/TestLibrary.hpp"
+#include "../../TestLibrary/TestLibrary.hpp"

 #define AS_CLASS(name, contents)                                                                                       \
    { #name, "namespace Pokemon{ [ItemUse effect=" #name "] class " #name " : ItemUseScript { " contents "}}" }
--- a/tests/ScriptTests/Angelscript/ScriptOwnerTest.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptOwnerTest.cpp
@@ -3,7 +3,7 @@
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../TestLibrary/TestLibrary.hpp"
+#include "../../TestLibrary/TestLibrary.hpp"

 static std::unordered_map<const char*, const char*> _scripts =
    std::unordered_map<const char*, const char*>{{"basic_ownership_test",
--- a/tests/ScriptTests/Angelscript/ScriptResolverTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptResolverTests.cpp
@@ -2,7 +2,7 @@
 #include <doctest.h>
 #include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../TestLibrary/TestLibrary.hpp"
+#include "../../TestLibrary/TestLibrary.hpp"

 static std::unordered_map<const char*, const char*> _scripts =
    std::unordered_map<const char*, const char*>{{"testScript1", R"(
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Battle/BattleTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Battle/BattleTests.cpp
@@ -4,7 +4,7 @@
 #include "../../../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../TestLibrary/TestLibrary.hpp"
+#include "../../../../TestLibrary/TestLibrary.hpp"

 static std::unordered_map<const char*, const char*> _scripts =
    std::unordered_map<const char*, const char*>{{"testScript1", R"(
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Battle/PokemonTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Battle/PokemonTests.cpp
@@ -3,7 +3,7 @@
 #include "../../../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../TestLibrary/TestLibrary.hpp"
+#include "../../../../TestLibrary/TestLibrary.hpp"

 static std::unordered_map<const char*, const char*> _scripts =
    std::unordered_map<const char*, const char*>{{"testScript1", R"(
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/FormesTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/FormesTests.cpp
@@ -2,7 +2,7 @@
 #include <doctest.h>
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../TestLibrary/TestLibrary.hpp"
+#include "../../../../TestLibrary/TestLibrary.hpp"

 static std::unordered_map<const char*, const char*> _scripts =
    std::unordered_map<const char*, const char*>{{"testScript1", R"(
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/ItemDataTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/ItemDataTests.cpp
@@ -2,7 +2,7 @@
 #include <doctest.h>
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../TestLibrary/TestLibrary.hpp"
+#include "../../../../TestLibrary/TestLibrary.hpp"

 static std::unordered_map<const char*, const char*> _scripts =
    std::unordered_map<const char*, const char*>{{"testScript1", R"(
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/MoveTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/MoveTests.cpp
@@ -2,7 +2,7 @@
 #include <doctest.h>
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../TestLibrary/TestLibrary.hpp"
+#include "../../../../TestLibrary/TestLibrary.hpp"

 static std::unordered_map<const char*, const char*> _scripts =
    std::unordered_map<const char*, const char*>{{"testScript1", R"(
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/SpeciesTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/SpeciesTests.cpp
@@ -2,7 +2,7 @@
 #include <doctest.h>
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../TestLibrary/TestLibrary.hpp"
+#include "../../../../TestLibrary/TestLibrary.hpp"

 static std::unordered_map<const char*, const char*> _scripts =
    std::unordered_map<const char*, const char*>{{"testScript1", R"(
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/StaticLibraryTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/StaticLibraryTests.cpp
@@ -2,7 +2,7 @@
 #include <doctest.h>
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../TestLibrary/TestLibrary.hpp"
+#include "../../../../TestLibrary/TestLibrary.hpp"

 static std::unordered_map<const char*, const char*> _scripts =
    std::unordered_map<const char*, const char*>{{"testScript1", R"(