rbx.cp 0.5.71__py3-none-any.whl → 0.5.73__py3-none-any.whl

rbx/box/cli.py

@@ -60,7 +60,7 @@ app.add_typer(
 )
 app.add_typer(
     download.app,
-    name='download',
+    name='download, down',
     cls=annotations.AliasGroup,
     help='Download an asset from supported repositories (sub-command).',
     rich_help_panel='Management',
@@ -104,12 +104,10 @@ def main(
         help='Whether to compile and run testlib components with sanitizers enabled. '
         'If you want to run the solutions with sanitizers enabled, use the "-s" flag in the corresponding run command.',
     ),
-    debug_logs: bool = typer.Option(
-        False,
-        '--debug-logs',
-        '--debug',
-        '-d',
-        help='Whether to save extra debug logs along with the evaluation results.',
+    capture: bool = typer.Option(
+        True,
+        '--capture',
+        help='Whether to save extra logs and outputs from interactive solutions.',
     ),
 ):
     if cd.is_problem_package() and not package.is_cache_valid():
@@ -125,7 +123,7 @@ def main(
             '[warning]Sanitizers are running just for testlib components.\n'
             'If you want to run the solutions with sanitizers enabled, use the [item]-s[/item] flag in the corresponding run command.[/warning]'
         )
-    state.STATE.debug_logs = debug_logs
+    state.STATE.debug_logs = capture
 
 
 @app.command('ui', hidden=True)
@@ -136,6 +134,15 @@ def ui():
     ui_pkg.start()
 
 
+@app.command(
+    'on',
+    help='Run a command in the context of a problem (or a set of problems) of a contest.',
+    context_settings={'allow_extra_args': True, 'ignore_unknown_options': True},
+)
+def on(ctx: typer.Context, problems: str) -> None:
+    contest.on(ctx, problems)
+
+
 @app.command('diff', hidden=True)
 def diff(path1: pathlib.Path, path2: pathlib.Path):
     from rbx.box.ui import main as ui_pkg

rbx/box/contest/contest_utils.py

@@ -1,5 +1,30 @@
+from typing import List
+
 from rbx.box import environment, package
 from rbx.box.contest import contest_package
+from rbx.box.contest.schema import ContestProblem
+
+
+def match_problem(problems: str, contest_problem: ContestProblem) -> bool:
+    short_name = contest_problem.short_name.lower()
+    problems = problems.lower()
+    if problems == '*':
+        return True
+    if '-' in problems:
+        start, end = problems.split('-')
+        return start <= short_name <= end
+    problem_set = set(p.strip().lower() for p in problems.split(','))
+    return short_name in problem_set
+
+
+def get_problems_of_interest(problems: str) -> List[ContestProblem]:
+    contest = contest_package.find_contest_package_or_die()
+    problems_of_interest = []
+
+    for p in contest.problems:
+        if match_problem(problems, p):
+            problems_of_interest.append(p)
+    return problems_of_interest
 
 
 def clear_all_caches():

rbx/box/contest/main.py

@@ -232,3 +232,27 @@ def each(ctx: typer.Context) -> None:
         console.console.print(
             '[error]One of the commands above failed. Check the output![/error]'
         )
+
+
+@app.command(
+    'on',
+    help='Run a command in the problem (or in a set of problems) of a context.',
+    context_settings={'allow_extra_args': True, 'ignore_unknown_options': True},
+)
+@within_contest
+def on(ctx: typer.Context, problems: str) -> None:
+    command = ' '.join(['rbx'] + ctx.args)
+    problems_of_interest = contest_utils.get_problems_of_interest(problems)
+
+    if not problems_of_interest:
+        console.console.print(
+            f'[error]No problems found in contest matching [item]{problems}[/item].[/error]'
+        )
+        raise typer.Exit(1)
+
+    for p in problems_of_interest:
+        console.console.print(
+            f'[status]Running [item]{command}[/item] for [item]{p.short_name}[/item]...[/status]'
+        )
+        subprocess.call(command, cwd=p.get_path(), shell=True)
+        console.console.print()

rbx/box/download.py

@@ -5,7 +5,7 @@ from typing import Optional
 import typer
 
 from rbx import annotations, console
-from rbx.box import header, package
+from rbx.box import header, package, remote
 from rbx.box.schema import CodeItem
 from rbx.config import get_builtin_checker, get_jngen, get_testlib
 from rbx.grading import steps
@@ -72,3 +72,21 @@ def checker(name: str):
     console.console.print(
         f'[success]Downloaded [item]{name}[/item] into current package.[/success]'
     )
+
+
+@app.command('remote, r', help='Download a remote code.')
+@package.within_problem
+def remote_cmd(
+    name: str,
+    output: Optional[str] = typer.Option(
+        None,
+        '-o',
+        '--output',
+        help='Whether to not build outputs for tests and run checker.',
+    ),
+):
+    path = remote.expand_file(name)
+
+    if output is not None:
+        pathlib.Path(output).parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy(str(path), output)

rbx/box/ui/screens/run_explorer.py

@@ -46,7 +46,7 @@ class RunExplorerScreen(Screen):
             if pkg.type == TaskType.COMMUNICATION:
                 tips.display = True
                 tips.write(
-                    'This is an interactive problem.\nYou can use the [bold blue]rbx -d run[/bold blue] command to capture the interaction between the processes and see them here.'
+                    'This is an interactive problem.\nYou can use the [bold blue]rbx --capture run[/bold blue] command to capture the interaction between the processes and see them here.'
                 )
             yield tips
 

rbx/resources/packagers/boca/checker.sh

@@ -26,7 +26,7 @@ printf "%s" "${TestlibContent}" >testlib.h
 printf "%s" "${RbxHeaderContent}" >rbx.h
 printf "%s" "${CheckerContent}" >$CHECKER_PATH
 
-checker_hash=($(md5sum $CHECKER_PATH))
+checker_hash=($(cat $CHECKER_PATH rbx.h testlib.h | md5sum))
 checker_cache="/tmp/boca-chk-${checker_hash}"
 
 echo "Polygon checker hash: $checker_hash"

rbx/resources/packagers/boca/interactive/c

@@ -81,10 +81,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1
@@ -132,38 +132,65 @@ SFPID=\$!
 ./interactor.exe "stdin0" "stdout0" <fifo.out >fifo.in 2>stderr0 &
 INTPID=\$!
 
-wait \$SFPID
-ECSF=\$?
+ECINT=0
+ECSF=0
 
-wait \$INTPID
-ECINT=\$?
+wait -p EXITID -n \$SFPID \$INTPID
+ECEXIT=\$?
+if [[ \$ECEXIT -ne 0 ]]; then
+  kill -SIGTERM \$SFPID \$INTPID 2>/dev/null
+fi
+
+EXITFIRST=none
+if [[ \$EXITID -eq \$INTPID ]]; then
+  wait \$SFPID
+  ECSF=\$?
+  ECINT=\$ECEXIT
+  EXITFIRST=interactor
+else
+  wait \$INTPID
+  ECINT=\$?
+  ECSF=\$ECEXIT
+  EXITFIRST=solution
+fi
 
 rm -rf fifo.in fifo.out
 
 echo "Ran solution as \$@" &>>stderr0
 echo "interactor exitcode \$ECINT" &>>stderr0
 echo "solution exitcode \$ECSF" &>>stderr0
+echo "exit first \$EXITFIRST" &>>stderr0
+
+finish() {
+  echo "exitting from runit.sh with exit code \$1" &>>stderr0
+  exit \$1
+}
+
+# 1. Check for interactor errors.
+if [[ \$ECSF -eq -SIGPIPE ]] || [[ \$ECSF -eq -SIGTERM ]] || [[ \$ECSF -ne 0 ]] && ! cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
+  if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
+    echo "testlib exitcode \$ECINT" >stdout0
+    finish 0
+  elif [[ \$ECINT -ne 0 ]]; then
+    finish 9
+  fi
+fi
 
-RTE=0
-if [[ \$ECSF -eq -13 ]]; then
-  RTE=0
-elif [[ \$ECSF -ne 0 ]] && cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
-  echo "Found EOF RTE" &>>stderr0
-  RTE=1
+# 2. Check for solution errors.
+if [[ \$ECSF -ne 0 ]]; then
+  finish \$ECSF
 fi
 
-ret=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]] && [[ \$RTE -eq 0 ]]; then
+# 3. Check for interactor without looking at solution output.
+if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
   echo "testlib exitcode \$ECINT" >stdout0
-  ret=0
-elif [[ \$ECSF -ne 0 ]]; then
-  ret=\$ECSF
+  finish 0
 elif [[ \$ECINT -ne 0 ]]; then
-  ret=9
+  finish 9
 fi
 
-echo "exitting from runit.sh with exit code \$ret" &>>stderr0
-exit \$ret
+# 4. Finish with zero and later check output.
+finish 0
 EOF
 
 chmod 755 runit.sh

rbx/resources/packagers/boca/interactive/cc

@@ -81,10 +81,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1
@@ -132,38 +132,65 @@ SFPID=\$!
 ./interactor.exe "stdin0" "stdout0" <fifo.out >fifo.in 2>stderr0 &
 INTPID=\$!
 
-wait \$SFPID
-ECSF=\$?
+ECINT=0
+ECSF=0
 
-wait \$INTPID
-ECINT=\$?
+wait -p EXITID -n \$SFPID \$INTPID
+ECEXIT=\$?
+if [[ \$ECEXIT -ne 0 ]]; then
+  kill -SIGTERM \$SFPID \$INTPID 2>/dev/null
+fi
+
+EXITFIRST=none
+if [[ \$EXITID -eq \$INTPID ]]; then
+  wait \$SFPID
+  ECSF=\$?
+  ECINT=\$ECEXIT
+  EXITFIRST=interactor
+else
+  wait \$INTPID
+  ECINT=\$?
+  ECSF=\$ECEXIT
+  EXITFIRST=solution
+fi
 
 rm -rf fifo.in fifo.out
 
 echo "Ran solution as \$@" &>>stderr0
 echo "interactor exitcode \$ECINT" &>>stderr0
 echo "solution exitcode \$ECSF" &>>stderr0
+echo "exit first \$EXITFIRST" &>>stderr0
+
+finish() {
+  echo "exitting from runit.sh with exit code \$1" &>>stderr0
+  exit \$1
+}
+
+# 1. Check for interactor errors.
+if [[ \$ECSF -eq -SIGPIPE ]] || [[ \$ECSF -eq -SIGTERM ]] || [[ \$ECSF -ne 0 ]] && ! cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
+  if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
+    echo "testlib exitcode \$ECINT" >stdout0
+    finish 0
+  elif [[ \$ECINT -ne 0 ]]; then
+    finish 9
+  fi
+fi
 
-RTE=0
-if [[ \$ECSF -eq -13 ]]; then
-  RTE=0
-elif [[ \$ECSF -ne 0 ]] && cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
-  echo "Found EOF RTE" &>>stderr0
-  RTE=1
+# 2. Check for solution errors.
+if [[ \$ECSF -ne 0 ]]; then
+  finish \$ECSF
 fi
 
-ret=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]] && [[ \$RTE -eq 0 ]]; then
+# 3. Check for interactor without looking at solution output.
+if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
   echo "testlib exitcode \$ECINT" >stdout0
-  ret=0
-elif [[ \$ECSF -ne 0 ]]; then
-  ret=\$ECSF
+  finish 0
 elif [[ \$ECINT -ne 0 ]]; then
-  ret=9
+  finish 9
 fi
 
-echo "exitting from runit.sh with exit code \$ret" &>>stderr0
-exit \$ret
+# 4. Finish with zero and later check output.
+finish 0
 EOF
 
 chmod 755 runit.sh

rbx/resources/packagers/boca/interactive/cpp

@@ -81,10 +81,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1
@@ -132,37 +132,65 @@ SFPID=\$!
 ./interactor.exe "stdin0" "stdout0" <fifo.out >fifo.in 2>stderr0 &
 INTPID=\$!
 
-wait \$SFPID
-ECSF=\$?
+ECINT=0
+ECSF=0
 
-wait \$INTPID
-ECINT=\$?
+wait -p EXITID -n \$SFPID \$INTPID
+ECEXIT=\$?
+if [[ \$ECEXIT -ne 0 ]]; then
+  kill -SIGTERM \$SFPID \$INTPID 2>/dev/null
+fi
+
+EXITFIRST=none
+if [[ \$EXITID -eq \$INTPID ]]; then
+  wait \$SFPID
+  ECSF=\$?
+  ECINT=\$ECEXIT
+  EXITFIRST=interactor
+else
+  wait \$INTPID
+  ECINT=\$?
+  ECSF=\$ECEXIT
+  EXITFIRST=solution
+fi
 
 rm -rf fifo.in fifo.out
 
 echo "Ran solution as \$@" &>>stderr0
 echo "interactor exitcode \$ECINT" &>>stderr0
 echo "solution exitcode \$ECSF" &>>stderr0
+echo "exit first \$EXITFIRST" &>>stderr0
+
+finish() {
+  echo "exitting from runit.sh with exit code \$1" &>>stderr0
+  exit \$1
+}
+
+# 1. Check for interactor errors.
+if [[ \$ECSF -eq -SIGPIPE ]] || [[ \$ECSF -eq -SIGTERM ]] || [[ \$ECSF -ne 0 ]] && ! cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
+  if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
+    echo "testlib exitcode \$ECINT" >stdout0
+    finish 0
+  elif [[ \$ECINT -ne 0 ]]; then
+    finish 9
+  fi
+fi
 
-RTE=0
-if [[ \$ECSF -eq -13 ]]; then
-  RTE=0
-elif [[ \$ECSF -ne 0 ]] && cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
-  echo "Found EOF RTE" &>>stderr0
-  RTE=1
+# 2. Check for solution errors.
+if [[ \$ECSF -ne 0 ]]; then
+  finish \$ECSF
 fi
-ret=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]] && [[ \$RTE -eq 0 ]]; then
+
+# 3. Check for interactor without looking at solution output.
+if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
   echo "testlib exitcode \$ECINT" >stdout0
-  ret=0
-elif [[ \$ECSF -ne 0 ]]; then
-  ret=\$ECSF
+  finish 0
 elif [[ \$ECINT -ne 0 ]]; then
-  ret=9
+  finish 9
 fi
 
-echo "exitting from runit.sh with exit code \$ret" &>>stderr0
-exit \$ret
+# 4. Finish with zero and later check output.
+finish 0
 EOF
 
 chmod 755 runit.sh

rbx/resources/packagers/boca/interactive/java

@@ -99,10 +99,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1
@@ -145,38 +145,65 @@ SFPID=\$!
 ./interactor.exe "stdin0" "stdout0" <fifo.out >fifo.in 2>stderr0 &
 INTPID=\$!
 
-wait \$SFPID
-ECSF=\$?
+ECINT=0
+ECSF=0
 
-wait \$INTPID
-ECINT=\$?
+wait -p EXITID -n \$SFPID \$INTPID
+ECEXIT=\$?
+if [[ \$ECEXIT -ne 0 ]]; then
+  kill -SIGTERM \$SFPID \$INTPID 2>/dev/null
+fi
+
+EXITFIRST=none
+if [[ \$EXITID -eq \$INTPID ]]; then
+  wait \$SFPID
+  ECSF=\$?
+  ECINT=\$ECEXIT
+  EXITFIRST=interactor
+else
+  wait \$INTPID
+  ECINT=\$?
+  ECSF=\$ECEXIT
+  EXITFIRST=solution
+fi
 
 rm -rf fifo.in fifo.out
 
 echo "Ran solution as \$@" &>>stderr0
 echo "interactor exitcode \$ECINT" &>>stderr0
 echo "solution exitcode \$ECSF" &>>stderr0
+echo "exit first \$EXITFIRST" &>>stderr0
+
+finish() {
+  echo "exitting from runit.sh with exit code \$1" &>>stderr0
+  exit \$1
+}
 
-RTE=0
-if [[ \$ECSF -eq -13 ]]; then
-  RTE=0
-elif [[ \$ECSF -ne 0 ]] && cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
-  echo "Found EOF RTE" &>>stderr0
-  RTE=1
+# 1. Check for interactor errors.
+if [[ \$ECSF -eq -SIGPIPE ]] || [[ \$ECSF -eq -SIGTERM ]] || [[ \$ECSF -ne 0 ]] && ! cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
+  if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
+    echo "testlib exitcode \$ECINT" >stdout0
+    finish 0
+  elif [[ \$ECINT -ne 0 ]]; then
+    finish 9
+  fi
 fi
 
-ret=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]] && [[ \$RTE -eq 0 ]]; then
+# 2. Check for solution errors.
+if [[ \$ECSF -ne 0 ]]; then
+  finish \$ECSF
+fi
+
+# 3. Check for interactor without looking at solution output.
+if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
   echo "testlib exitcode \$ECINT" >stdout0
-  ret=0
-elif [[ \$ECSF -ne 0 ]]; then
-  ret=\$ECSF
+  finish 0
 elif [[ \$ECINT -ne 0 ]]; then
-  ret=9
+  finish 9
 fi
 
-echo "exitting from runit.sh with exit code \$ret" &>>stderr0
-exit \$ret
+# 4. Finish with zero and later check output.
+finish 0
 EOF
 
 chmod 755 runit.sh

rbx/resources/packagers/boca/interactive/kt

@@ -91,10 +91,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1
@@ -136,38 +136,65 @@ SFPID=\$!
 ./interactor.exe "stdin0" "stdout0" <fifo.out >fifo.in 2>stderr0 &
 INTPID=\$!
 
-wait \$SFPID
-ECSF=\$?
+ECINT=0
+ECSF=0
 
-wait \$INTPID
-ECINT=\$?
+wait -p EXITID -n \$SFPID \$INTPID
+ECEXIT=\$?
+if [[ \$ECEXIT -ne 0 ]]; then
+  kill -SIGTERM \$SFPID \$INTPID 2>/dev/null
+fi
+
+EXITFIRST=none
+if [[ \$EXITID -eq \$INTPID ]]; then
+  wait \$SFPID
+  ECSF=\$?
+  ECINT=\$ECEXIT
+  EXITFIRST=interactor
+else
+  wait \$INTPID
+  ECINT=\$?
+  ECSF=\$ECEXIT
+  EXITFIRST=solution
+fi
 
 rm -rf fifo.in fifo.out
 
 echo "Ran solution as \$@" &>>stderr0
 echo "interactor exitcode \$ECINT" &>>stderr0
 echo "solution exitcode \$ECSF" &>>stderr0
+echo "exit first \$EXITFIRST" &>>stderr0
+
+finish() {
+  echo "exitting from runit.sh with exit code \$1" &>>stderr0
+  exit \$1
+}
 
-RTE=0
-if [[ \$ECSF -eq -13 ]]; then
-  RTE=0
-elif [[ \$ECSF -ne 0 ]] && cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
-  echo "Found EOF RTE" &>>stderr0
-  RTE=1
+# 1. Check for interactor errors.
+if [[ \$ECSF -eq -SIGPIPE ]] || [[ \$ECSF -eq -SIGTERM ]] || [[ \$ECSF -ne 0 ]] && ! cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
+  if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
+    echo "testlib exitcode \$ECINT" >stdout0
+    finish 0
+  elif [[ \$ECINT -ne 0 ]]; then
+    finish 9
+  fi
 fi
 
-ret=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]] && [[ \$RTE -eq 0 ]]; then
+# 2. Check for solution errors.
+if [[ \$ECSF -ne 0 ]]; then
+  finish \$ECSF
+fi
+
+# 3. Check for interactor without looking at solution output.
+if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
   echo "testlib exitcode \$ECINT" >stdout0
-  ret=0
-elif [[ \$ECSF -ne 0 ]]; then
-  ret=\$ECSF
+  finish 0
 elif [[ \$ECINT -ne 0 ]]; then
-  ret=9
+  finish 9
 fi
 
-echo "exitting from runit.sh with exit code \$ret" &>>stderr0
-exit \$ret
+# 4. Finish with zero and later check output.
+finish 0
 EOF
 
 chmod 755 runit.sh

rbx/resources/packagers/boca/interactive/py2

@@ -78,10 +78,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1
@@ -123,38 +123,65 @@ SFPID=\$!
 ./interactor.exe "stdin0" "stdout0" <fifo.out >fifo.in 2>stderr0 &
 INTPID=\$!
 
-wait \$SFPID
-ECSF=\$?
+ECINT=0
+ECSF=0
 
-wait \$INTPID
-ECINT=\$?
+wait -p EXITID -n \$SFPID \$INTPID
+ECEXIT=\$?
+if [[ \$ECEXIT -ne 0 ]]; then
+  kill -SIGTERM \$SFPID \$INTPID 2>/dev/null
+fi
+
+EXITFIRST=none
+if [[ \$EXITID -eq \$INTPID ]]; then
+  wait \$SFPID
+  ECSF=\$?
+  ECINT=\$ECEXIT
+  EXITFIRST=interactor
+else
+  wait \$INTPID
+  ECINT=\$?
+  ECSF=\$ECEXIT
+  EXITFIRST=solution
+fi
 
 rm -rf fifo.in fifo.out
 
 echo "Ran solution as \$@" &>>stderr0
 echo "interactor exitcode \$ECINT" &>>stderr0
 echo "solution exitcode \$ECSF" &>>stderr0
+echo "exit first \$EXITFIRST" &>>stderr0
+
+finish() {
+  echo "exitting from runit.sh with exit code \$1" &>>stderr0
+  exit \$1
+}
+
+# 1. Check for interactor errors.
+if [[ \$ECSF -eq -SIGPIPE ]] || [[ \$ECSF -eq -SIGTERM ]] || [[ \$ECSF -ne 0 ]] && ! cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
+  if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
+    echo "testlib exitcode \$ECINT" >stdout0
+    finish 0
+  elif [[ \$ECINT -ne 0 ]]; then
+    finish 9
+  fi
+fi
 
-RTE=0
-if [[ \$ECSF -eq -13 ]]; then
-  RTE=0
-elif [[ \$ECSF -ne 0 ]] && cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
-  echo "Found EOF RTE" &>>stderr0
-  RTE=1
+# 2. Check for solution errors.
+if [[ \$ECSF -ne 0 ]]; then
+  finish \$ECSF
 fi
 
-ret=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]] && [[ \$RTE -eq 0 ]]; then
+# 3. Check for interactor without looking at solution output.
+if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
   echo "testlib exitcode \$ECINT" >stdout0
-  ret=0
-elif [[ \$ECSF -ne 0 ]]; then
-  ret=\$ECSF
+  finish 0
 elif [[ \$ECINT -ne 0 ]]; then
-  ret=9
+  finish 9
 fi
 
-echo "exitting from runit.sh with exit code \$ret" &>>stderr0
-exit \$ret
+# 4. Finish with zero and later check output.
+finish 0
 EOF
 
 chmod 755 runit.sh

rbx/resources/packagers/boca/interactive/py3

@@ -78,10 +78,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1
@@ -115,44 +115,73 @@ cat <<EOF >runit.sh
 #!/bin/bash
 mkfifo fifo.in fifo.out
 
+echo "Running solution as \$@" >&2
+
 "\$@" >fifo.out <fifo.in 2>/dev/null &
 SFPID=\$!
 
 ./interactor.exe "stdin0" "stdout0" <fifo.out >fifo.in 2>stderr0 &
 INTPID=\$!
 
-wait \$SFPID
-ECSF=\$?
+ECINT=0
+ECSF=0
+
+wait -p EXITID -n \$SFPID \$INTPID
+ECEXIT=\$?
+if [[ \$ECEXIT -ne 0 ]]; then
+  kill -SIGTERM \$SFPID \$INTPID 2>/dev/null
+fi
 
-wait \$INTPID
-ECINT=\$?
+EXITFIRST=none
+if [[ \$EXITID -eq \$INTPID ]]; then
+  wait \$SFPID
+  ECSF=\$?
+  ECINT=\$ECEXIT
+  EXITFIRST=interactor
+else
+  wait \$INTPID
+  ECINT=\$?
+  ECSF=\$ECEXIT
+  EXITFIRST=solution
+fi
 
 rm -rf fifo.in fifo.out
 
 echo "Ran solution as \$@" &>>stderr0
 echo "interactor exitcode \$ECINT" &>>stderr0
 echo "solution exitcode \$ECSF" &>>stderr0
+echo "exit first \$EXITFIRST" &>>stderr0
+
+finish() {
+  echo "exitting from runit.sh with exit code \$1" &>>stderr0
+  exit \$1
+}
+
+# 1. Check for interactor errors.
+if [[ \$ECSF -eq -SIGPIPE ]] || [[ \$ECSF -eq -SIGTERM ]] || [[ \$ECSF -ne 0 ]] && ! cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
+  if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
+    echo "testlib exitcode \$ECINT" >stdout0
+    finish 0
+  elif [[ \$ECINT -ne 0 ]]; then
+    finish 9
+  fi
+fi
 
-RTE=0
-if [[ \$ECSF -eq -13 ]]; then
-  RTE=0
-elif [[ \$ECSF -ne 0 ]] && cat stderr0 | grep -q "wrong output format Unexpected end of file"; then
-  echo "Found EOF RTE" &>>stderr0
-  RTE=1
+# 2. Check for solution errors.
+if [[ \$ECSF -ne 0 ]]; then
+  finish \$ECSF
 fi
 
-ret=0
-if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]] && [[ \$RTE -eq 0 ]]; then
+# 3. Check for interactor without looking at solution output.
+if [[ \$ECINT -ge 1 ]] && [[ \$ECINT -le 4 ]]; then
   echo "testlib exitcode \$ECINT" >stdout0
-  ret=0
-elif [[ \$ECSF -ne 0 ]]; then
-  ret=\$ECSF
+  finish 0
 elif [[ \$ECINT -ne 0 ]]; then
-  ret=9
+  finish 9
 fi
 
-echo "exitting from runit.sh with exit code \$ret" &>>stderr0
-exit \$ret
+# 4. Finish with zero and later check output.
+finish 0
 EOF
 
 chmod 755 runit.sh

rbx/resources/packagers/boca/run/c

@@ -81,10 +81,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1

rbx/resources/packagers/boca/run/cc

@@ -81,10 +81,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1

rbx/resources/packagers/boca/run/cpp

@@ -81,10 +81,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1

rbx/resources/packagers/boca/run/java

@@ -99,10 +99,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1

rbx/resources/packagers/boca/run/kt

@@ -99,10 +99,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1

rbx/resources/packagers/boca/run/py2

@@ -79,10 +79,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1

rbx/resources/packagers/boca/run/py3

@@ -79,10 +79,10 @@ fi
 
 time=$3
 if [ "$time" -gt "0" ]; then
-  let "ttime = $time + 30"
+  let "ttime = $time * 4"
 else
   time=1
-  ttime=30
+  ttime=4
 fi
 
 nruns=1

{rbx_cp-0.5.71.dist-info → rbx_cp-0.5.73.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.5.71
+Version: 0.5.73
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0

{rbx_cp-0.5.71.dist-info → rbx_cp-0.5.73.dist-info}/RECORD

@@ -5,20 +5,20 @@ rbx/box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/builder.py,sha256=MDm2qqmhedAbhn3rWP6cDwbBsGhV6sz_2sg1zLkPDw0,3613
 rbx/box/cd.py,sha256=KGaqXHnv2hCumZS2VdMezFfwFEQcSq0rt05_KZtuQAo,1570
 rbx/box/checkers.py,sha256=0r_9cdRfZJlDuBuBB7xrzMJixcVL2JdBe4dmWAQym04,12828
-rbx/box/cli.py,sha256=ssm8X4klvtvQS9P-bABQTQkdYEc07ydWIgJ3l78Cuo4,27524
+rbx/box/cli.py,sha256=jWL-Tws_74d0WFuHymk_VSTWTy8MGgmroBD0o5sqGxo,27767
 rbx/box/code.py,sha256=2oC1JbZiwfeg53ZICPig-KJYchqFRIZz-inlM-cLc7Q,19911
 rbx/box/compile.py,sha256=Kzn5mEQu4vb91W9vjyt0DS6cfPJzFLTUoowFj7uHLUo,2539
 rbx/box/conftest.py,sha256=sEmciXSeDC-wmrZ1JSxbsUenKNP_VWW32mrCun2pY3I,1070
 rbx/box/contest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbx/box/contest/build_contest_statements.py,sha256=DtbzLShc8zzbjE-1sBFtPY3JGhSwm48q6eSOPYWSVxQ,11399
 rbx/box/contest/contest_package.py,sha256=OaUbpBtkhkgOPzJ1ccI_Vq4FMSaJvZm3gMOKfVY8oy4,3032
-rbx/box/contest/contest_utils.py,sha256=TDE7I6YQJlu4dQd68wzOp019bNgqiT0RlM-LMQMjL9w,301
-rbx/box/contest/main.py,sha256=u76kAQSVWEuyGLqVgyjXwYxJwHXAeEHMwbM7MfenKvE,7574
+rbx/box/contest/contest_utils.py,sha256=fsWHG1e65wq9zvRY3tdf32VF0nU1yzGTOBX5yjXiNk4,1102
+rbx/box/contest/main.py,sha256=5IRdTRxk4u7wSFgmcC18mefuuLfgsJGRlYWl3pLg-v8,8416
 rbx/box/contest/schema.py,sha256=OOoQUPYAHzu78aQfRbrqGepiUdGxSVRR1VQKFbKHjkE,6111
 rbx/box/contest/statements.py,sha256=Or8gFb6P_oViGdeiVgepXsvd_W84mA7LRaVmiAXWWSg,2977
 rbx/box/creation.py,sha256=Evz7K6JoarD-4JJQsZsgoxU9FgCF9Z7-LfuroG4Cqls,2444
 rbx/box/deferred.py,sha256=II3X9e87JCOZtmspnHh-n4PFqh-FsH_oc0XJHZ9ZYVQ,691
-rbx/box/download.py,sha256=DxAiAk4lDYWEz1C9UTvZzHTq6hgm4fxGezApm2IkCTM,2601
+rbx/box/download.py,sha256=tLW5gLVeLk0gHMEMwScSoHIXQPkXuPsqXzItsrsnUZY,3070
 rbx/box/dump_schemas.py,sha256=3j5t47_vJmXj0BCczxDX6ByOcsfolGEDNCBXlPpk86w,593
 rbx/box/environment.py,sha256=Kp69MekUwwoVpupnafUcN5KAbP-ZTCwe0OQXt1h0FN8,11859
 rbx/box/extensions.py,sha256=Von8kIeXvNFTkGlMRMTvL2HIHPwlkuiMswr-ydbGV1w,519
@@ -83,7 +83,7 @@ rbx/box/ui/screens/differ.py,sha256=Sp6xQwsFiqMl0tvbdhiPdh8AWUNPT8jshce3H7DhPrw,
 rbx/box/ui/screens/error.py,sha256=k6Rs5maR_APKepMtPcDMSXo6BDKrP-pAnFFJgqmXDKE,496
 rbx/box/ui/screens/rich_log_modal.py,sha256=ciKC7_3SLKToDvQA9mrcNNdKBX85f2B1ASgrtyDvn38,799
 rbx/box/ui/screens/run.py,sha256=eKIfFRi-VbqKDxlhZDuOEdVl91XCndnmNIZyj_LMV0c,6028
-rbx/box/ui/screens/run_explorer.py,sha256=YhcMd1d1ZNZWf2pOrdkOS_FN1M1t0N6T8U2tAHAxMfM,3389
+rbx/box/ui/screens/run_explorer.py,sha256=SC0GqUTqVFoaXKRPConMltUgDBC2QSBeN3xuN0KS8m4,3396
 rbx/box/ui/screens/run_test_explorer.py,sha256=D6sXTEbqzXI7uPu3EXZoFyIBxlGFbkdeyWj9OwYFHS8,6681
 rbx/box/ui/screens/selector.py,sha256=s9JR74anCt8NAlkk7GeNvqyqz2YEhCWTebOUNQ7HrXg,856
 rbx/box/ui/screens/test_explorer.py,sha256=Iv6yDqELr4-Ouo9PSD5Wr3bTdbmx8VfrK9zj5ULhPlg,4078
@@ -139,7 +139,7 @@ rbx/resources/default_setter_config.mac.yml,sha256=i28xwAUDg-kuxx19knCiYkh-NR7Qe
 rbx/resources/default_setter_config.yml,sha256=oy6fbuQyYaJS2Cw2zcbYcBBGt6138CyB3-bLl45_QqY,1000
 rbx/resources/envs/default.rbx.yml,sha256=8gl4DXc5mVISx__1libPQfmuHYdW32xjysfqpNESIAo,853
 rbx/resources/envs/isolate.rbx.yml,sha256=VZAJ-Mu-A5Rt4m0VtMygOXA7eLLvCCmoorv_0acDmXQ,870
-rbx/resources/packagers/boca/checker.sh,sha256=q34ZS2clnctOj_8XPUxUGc-qm0kGgUG9ThDm-WZRz3I,1196
+rbx/resources/packagers/boca/checker.sh,sha256=nNif_PIHriktliHI-N2_PxLEO3T1zXbTGnM58ok0G1g,1218
 rbx/resources/packagers/boca/compare.sh,sha256=a6AmQqwrIq616DHjp_S2l95wO7UiMVy0LQ9EajZKDDk,1201
 rbx/resources/packagers/boca/compile/c,sha256=7bx47zeZB5nJl2WmYmt2jjhQGgBnQnFwGFziL2p_Q-Y,4510
 rbx/resources/packagers/boca/compile/cc,sha256=B_18QkUGcjUg6yrTFlTQuMWnHpTWUKPZmFuk7Y0l1VA,4561
@@ -149,22 +149,22 @@ rbx/resources/packagers/boca/compile/kt,sha256=3B900QSD4jSXnX91gJbvI4ZmNELHSiBb5
 rbx/resources/packagers/boca/compile/pas,sha256=C5IwZzmZpIos49FrLGafRbdGPODNJn7N5JbnLX_FT_4,4576
 rbx/resources/packagers/boca/compile/py2,sha256=UJknN4xiKP8oMN8tRZ92tDlESXgBfRO69QfyUyjijvA,4739
 rbx/resources/packagers/boca/compile/py3,sha256=L5Yzl_G5kTdmx7N7-oW3Dm_sq4uQJleRmFq84WNfZXo,4739
-rbx/resources/packagers/boca/interactive/c,sha256=7AgLVL8TO0vGgpAyNVC08ceG83-_yPO7BIPHGLTerck,5720
-rbx/resources/packagers/boca/interactive/cc,sha256=7AgLVL8TO0vGgpAyNVC08ceG83-_yPO7BIPHGLTerck,5720
-rbx/resources/packagers/boca/interactive/cpp,sha256=BdyAz61YV1ojQGTKOXJXrMfN9zA9r4X3NnCRb4vJIEE,5719
-rbx/resources/packagers/boca/interactive/java,sha256=hruT1TAUfhLITRwlh3wW_JnziAfXr75ELZl_OLUELQs,6687
-rbx/resources/packagers/boca/interactive/kt,sha256=n32qFNKjiov49ABnbGPJUVc-yd66o-OtQhcSYQl5nV0,6621
-rbx/resources/packagers/boca/interactive/py2,sha256=Ml0oE-xWnGFLkpns8fkTMbpC0UqIOThMoC1i6oL_xJk,5884
-rbx/resources/packagers/boca/interactive/py3,sha256=EfbjcrISSdLp6W46tlk77d69jdrdw9z6rD8hBYaMHuQ,5848
+rbx/resources/packagers/boca/interactive/c,sha256=gLuJ9heX00i-8bmj5J1j4RcHaksMEDv-z3ykDoYqqZs,6360
+rbx/resources/packagers/boca/interactive/cc,sha256=gLuJ9heX00i-8bmj5J1j4RcHaksMEDv-z3ykDoYqqZs,6360
+rbx/resources/packagers/boca/interactive/cpp,sha256=gLuJ9heX00i-8bmj5J1j4RcHaksMEDv-z3ykDoYqqZs,6360
+rbx/resources/packagers/boca/interactive/java,sha256=seoD4td8n85l7v-8rqDuwEKhl3ekHnHkZ_Z3ypNVoJA,7327
+rbx/resources/packagers/boca/interactive/kt,sha256=L5-hTrQ9VblO0d1hBOjbHVzEp1GEELWo0N8AceULnCU,7261
+rbx/resources/packagers/boca/interactive/py2,sha256=ceNObaszmSzAxfK7CuXdjO-8XoR3PNa0kxieoJBlJFg,6524
+rbx/resources/packagers/boca/interactive/py3,sha256=htrTvWHoAulWV2e-Y9AlcpWNsq0_rv0ktrbTzxO96aE,6524
 rbx/resources/packagers/boca/interactor_compile.sh,sha256=5dvF_eYuAJS3wlxyjUIJvu9HUNiMvET17rgoPq-WIlc,1082
 rbx/resources/packagers/boca/run/bkp,sha256=xyDkZDaxgUrW-K2I0YJs8a8dJMuF-k8_ganDGxqhvUQ,4218
-rbx/resources/packagers/boca/run/c,sha256=s-Krq9mqJf587HEO0px2K2b4I0Gp4_vp-wZnJB6dsK4,3689
-rbx/resources/packagers/boca/run/cc,sha256=s-Krq9mqJf587HEO0px2K2b4I0Gp4_vp-wZnJB6dsK4,3689
-rbx/resources/packagers/boca/run/cpp,sha256=s-Krq9mqJf587HEO0px2K2b4I0Gp4_vp-wZnJB6dsK4,3689
-rbx/resources/packagers/boca/run/java,sha256=e5Yge3Q1Fp68M3Ad4tKHNXQ1KhqBD9pD3HUtvdShNcY,5580
-rbx/resources/packagers/boca/run/kt,sha256=JmnCGuGacFj2PJAGir9qSi31fXBuZd8ESkhxYIir-o8,4675
-rbx/resources/packagers/boca/run/py2,sha256=PGQC9wX_Gh_kcSC8oEMrO9dyibrw6iqZKo0UAoIP5Mo,4919
-rbx/resources/packagers/boca/run/py3,sha256=MyOvtoQAz76hw8Ut-8X9w5uvDbipzJ_XoZQww35ZYWQ,4919
+rbx/resources/packagers/boca/run/c,sha256=bhB-I-mJ4xNa6lr0OwC1O-eiMVTE_bdAd13nmySiT8A,3687
+rbx/resources/packagers/boca/run/cc,sha256=bhB-I-mJ4xNa6lr0OwC1O-eiMVTE_bdAd13nmySiT8A,3687
+rbx/resources/packagers/boca/run/cpp,sha256=bhB-I-mJ4xNa6lr0OwC1O-eiMVTE_bdAd13nmySiT8A,3687
+rbx/resources/packagers/boca/run/java,sha256=rAcvpriBr3NAuzzjMzIrtTBTgD9dLVr49dW2P7LmYNc,5578
+rbx/resources/packagers/boca/run/kt,sha256=0nTcFhEtGSJXLkPmGCqOx58XpTdoGn0qL5niePGDEdo,4673
+rbx/resources/packagers/boca/run/py2,sha256=2IobOou2k6oYIa_mw0DjeZaqJgw9ZQc69e6XYnRS-fo,4917
+rbx/resources/packagers/boca/run/py3,sha256=_w9IBoDhAThrABcvWfZQ0wOaqnzeiqwG5AL-eAQrVSU,4917
 rbx/resources/packagers/moj/scripts/c/compile.sh,sha256=d6IFuVf_EmUhkHg5urrv3G4e8AFFYgHqEYJ_ROs-A-M,231
 rbx/resources/packagers/moj/scripts/c/prep.sh,sha256=it1e07QRpsnku3-rXOO1ovaw-RJlVVPy9R3I6WWwgMM,126
 rbx/resources/packagers/moj/scripts/c/run.sh,sha256=w_DAapoBVMZj7uiA4TMcNi2D5S243Cvsa4VQ_OoHGtY,187
@@ -217,8 +217,8 @@ rbx/testcase.py,sha256=yKOq3CAJZ1YTmInvnoIs0u1iJnRj_X85XiWbLI-p9d8,1951
 rbx/testcase_rendering.py,sha256=nfmv6dSEqd4aR3TsaODwkKGK6AXty_DDKtWf_ejiQpI,2084
 rbx/testing_utils.py,sha256=x_PqD8Zd2PkN91NxVHUnSTs044-1WK5KKtttKQBXpFs,2083
 rbx/utils.py,sha256=SfR844_i0ebRDMkmS_w1YdZiWPc6h2RGADygewlWRbA,4845
-rbx_cp-0.5.71.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.71.dist-info/METADATA,sha256=WlUZiUqN3GGNvPImKchnK7wmp_A8PLnCX1DSm8P2q5U,3604
-rbx_cp-0.5.71.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rbx_cp-0.5.71.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.71.dist-info/RECORD,,
+rbx_cp-0.5.73.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.73.dist-info/METADATA,sha256=NK12BtXCVWjzZWL9Dnvo0R3zsd8pZSgRqL2xwng11-A,3604
+rbx_cp-0.5.73.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rbx_cp-0.5.73.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.73.dist-info/RECORD,,