piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11685 from shuffle2/updater-test

Browse Source 
test-updater.py: include space and unicode in paths to test
This commit is contained in:
Pierre Bourdon 2023-03-22 23:40:24 +01:00 committed by GitHub
commit eb7d7836fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/UpdaterCommon/UpdaterCommon.cpp
View File

@ -17,6 +17,7 @@
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/HttpRequest.h"
#include "Common/IOFile.h"
#include "Common/ScopeGuard.h"
#include "Common/StringUtil.h"
#include "UpdaterCommon/Platform.h"
@ -44,15 +45,15 @@ const std::array<u8, 32> UPDATE_PUB_KEY_TEST = {
0x9e, 0xe0, 0x9b, 0x28, 0xc9, 0x1a, 0x60, 0xb7, 0x67, 0x1c, 0xf3, 0xf6, 0xca, 0x1b, 0xdd, 0x1a};
// Where to log updater output.
static FILE* log_fp = stderr;
static File::IOFile log_file;
void LogToFile(const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
vfprintf(log_fp, fmt, args);
fflush(log_fp);
log_file.WriteString(StringFromFormatV(fmt, args));
log_file.Flush();
va_end(args);
}
@ -174,8 +175,8 @@ bool VerifySignature(const std::string& data, const std::string& b64_signature)
void FlushLog()
{
fflush(log_fp);
fclose(log_fp);
log_file.Flush();
log_file.Close();
}
void TodoList::Log() const
@ -698,9 +699,8 @@ bool RunUpdater(std::vector<std::string> args)
if (opts.log_file)
{
log_fp = fopen(opts.log_file.value().c_str(), "w");
if (!log_fp)
log_fp = stderr;
if (!log_file.Open(opts.log_file.value(), "w"))
log_file.SetHandle(stderr);
else
atexit(FlushLog);
}

3
Tools/test-updater.py
View File

@ -123,7 +123,7 @@ if __name__ == "__main__":
threading.Thread(target=http_server, daemon=True).start()
with tempfile.TemporaryDirectory() as tmp_dir:
with tempfile.TemporaryDirectory(suffix=" ¿ 🐬") as tmp_dir:
tmp_dir = Path(tmp_dir)
tmp_dolphin = tmp_dir.joinpath("dolphin")
@ -143,6 +143,7 @@ if __name__ == "__main__":
# XXX copies from just-created dir so Dolphin.ini is kept
shutil.copytree(tmp_dolphin, tmp_dolphin_next)
tmp_dolphin_next.joinpath("updater-test-file").write_text("test")
tmp_dolphin_next.joinpath("updater-test-filἑ").write_text("test")
with tmp_dolphin_next.joinpath("build_info.txt").open("a") as f:
print("test", file=f)
for ext in ("exe", "dll"):