Commit 64cab389 authored by dylan grafmyre's avatar dylan grafmyre
Browse files

windows doesn't return the pid on $! i guess

parent 73e97969
......@@ -181,7 +181,7 @@ maps/%.bsp: %.bsp
+sv_cheats 1 +nav_edit 1 +map navgen &
$(SHLEX_BIN) $(SHLEX_FLAGS) $(EPOLL_THEN_BIN) $(EPOLL_THEN_FLAGS) \
--literal ng_f --file "'$(MOD_DIR)/data/runme.txt'" --timeout-sec 1800 -- \
kill $$!
kill $(shell tasklist | grep hl2.exe | sed -re 's,^hl2.exe *([0-9][0-9]*).*$$,\1,')
# ^ watch "$(MOD_DIR)/data/runme.txt" for content "ng_f", when match: kill hl2.exe
# timeout: 30min
cp -v "$(MOD_DIR)/maps/navgen.nav" $@
......@@ -274,5 +274,3 @@ fast: lint maps/ttt_terrorcon_v2_fast.bsp ttt_terrorcon_v2_fast.game
lint: ttt_terrorcon_v2.bspzip-addlist
$(PYTHON_BIN) ./contrib/bspzip-lint $^ 2>&1 | tee $^.lint
......@@ -37,7 +37,7 @@ def main(argp=None, argv=None):
if match:
break
if arp.timeout_sec:
if argp.timeout_sec:
if (time.time() - start) > argp.timeout_sec:
LOGGER.warning('status: match=%s %s=%r', (match, argp.literal), argp.file, dat)
raise TimeoutError('epoll-then timeout')
......
......@@ -20,7 +20,8 @@ local function main()
print( "nav_generate:main: manual tasks: ['quit']" )
return
end
print( "nav_generate:main: unhandled state: " + string_repr(state) )
print( "nav_generate:main: unhandled state: " )
print ( string_repr(state) )
print( "nav_generate:main: manual tasks: ['quit']" )
end
timer.Simple( 2, main )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment