Skip to content

Load Extensions Early and Differentiate Client/Server Logs #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
A1steaksa wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Load Extensions Early and Differentiate Client/Server Logs #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
21166ac
Rename stubMaker because consistency is important and Linux will be s…
A1steaksa Apr 30, 2025
8654b0b
Color log prefix to differentiate server and client tests
A1steaksa Apr 30, 2025
220c427
Split gluatest_enable into two convars, one for server and one for cl…
A1steaksa Apr 30, 2025
48ae989
Don't re-run tests when hotloading
A1steaksa Apr 30, 2025
3449058
Stop complaining about mismatches that don't exist you old hag
A1steaksa May 1, 2025
6d4f8c1
Fix typo and style issues
A1steaksa May 1, 2025
b200c5e
Move loader to GLuaTest table
A1steaksa May 1, 2025
cd91f5b
Add cl_ and sv_ prefixes to logs to differentiate server and client t…
A1steaksa May 1, 2025
b44fab4
Merge branch 'main' into feature_improve-client-support
A1steaksa May 1, 2025
e5fd133
Minor formatting
A1steaksa May 1, 2025
8d6affe
Re-load extensions when running tests to make extension development e…
A1steaksa May 1, 2025
c0fc6b9
Merge branch 'feature_improve-client-support' of https://github.com/C…
A1steaksa May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions lua/gluatest/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,22 @@ GLuaTest = {
--- @diagnostic disable-next-line: param-type-mismatch
SelfTestConVar = CreateConVar( "gluatest_selftest_enable", "0", conVarFlags, "Should GLuaTest run its own tests?" ),

--- @type GLuaTest_Loader
Loader = include( "gluatest/loader.lua" ),

DeprecatedNotice = function( old, new )
local msg = [[GLuaTest: (DEPRECATION NOTICE) "]] .. old .. [[" is deprecated, use "]] .. new .. [[" instead.]]
if SERVER then MsgC( RED, msg .. "\n" ) end
end
}

--[[ Extensions ]] do

-- Because extensions do their own AddCSLuaFile calls, we need to load them immediately so local server clients receive them
GLuaTest.Loader.loadExtensions( "gluatest/extensions" )
end
--[[ Set Up Client Testing ]] do

if SERVER then
util.AddNetworkString( "GLuaTest_RunClientTests" )

Expand Down Expand Up @@ -125,11 +134,10 @@ GLuaTest.runAllTests = function()
return
end

GLuaTest.VERSION = VersionTools.getVersion()
-- Re-load extensions to make extension development easier
GLuaTest.Loader.loadExtensions( "gluatest/extensions" )

--- @type GLuaTest_Loader
local Loader = include( "gluatest/loader.lua" )
Loader.loadExtensions( "gluatest/extensions" )
GLuaTest.VERSION = VersionTools.getVersion()

local testPaths = {
"tests",
Expand All @@ -142,7 +150,7 @@ GLuaTest.runAllTests = function()

for i = 1, #testPaths do
local path = testPaths[i]
loadAllProjectsFrom( Loader, path, testFiles )
loadAllProjectsFrom( GLuaTest.Loader, path, testFiles )
end

hook.Run( "GLuaTest_RunTestFiles", testFiles )
Expand Down
12 changes: 10 additions & 2 deletions lua/gluatest/runner/logger.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,18 @@ local ResultLogger = {}


function ResultLogger.prefixLog( ... )
local prefixColor = SERVER and colors.server or colors.client
local prefixColor
local prefixText = "GLuaTest"
if SERVER then
prefixText = "sv_" .. prefixText
prefixColor = colors.server
else
prefixText = "cl_" .. prefixText
prefixColor = colors.client
end
Comment on lines +18 to +24

@sarahsturgeon sarahsturgeon May 1, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't love this.

Could we maybe only prefix them if the clientside convar is enabled, or similar? Or, perhaps, only prefix the client tests?


MsgC( colors.darkgrey, "[" )
MsgC( prefixColor, "GLuaTest" )
MsgC( prefixColor, prefixText )
MsgC( colors.darkgrey, "] " )
MsgC( ... )
end
Expand Down