From 0a2534c4f1e9c905c79b45f2bc774edc0638a07a Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 20 Oct 2014 18:11:00 +0200 Subject: [PATCH] actions: mark as IfNotCrossAppliance tests of command and command_lines All these tests copy to the appliance a tool built on the host, and run it. --- generator/actions.ml | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/generator/actions.ml b/generator/actions.ml index 955f63895..ed3695175 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -4236,67 +4236,67 @@ C, C (etc), C." }; proc_nr = Some 50; protocol_limit_warning = true; tests = [ - InitScratchFS, Always, TestResultString ( + InitScratchFS, IfNotCrossAppliance, TestResultString ( [["mkdir"; "/command"]; ["upload"; "test-command"; "/command/test-command"]; ["chmod"; "0o755"; "/command/test-command"]; ["command"; "/command/test-command 1"]], "Result1"), []; - InitScratchFS, Always, TestResultString ( + InitScratchFS, IfNotCrossAppliance, TestResultString ( [["mkdir"; "/command2"]; ["upload"; "test-command"; "/command2/test-command"]; ["chmod"; "0o755"; "/command2/test-command"]; ["command"; "/command2/test-command 2"]], "Result2\n"), []; - InitScratchFS, Always, TestResultString ( + InitScratchFS, IfNotCrossAppliance, TestResultString ( [["mkdir"; "/command3"]; ["upload"; "test-command"; "/command3/test-command"]; ["chmod"; "0o755"; "/command3/test-command"]; ["command"; "/command3/test-command 3"]], "\nResult3"), []; - InitScratchFS, Always, TestResultString ( + InitScratchFS, IfNotCrossAppliance, TestResultString ( [["mkdir"; "/command4"]; ["upload"; "test-command"; "/command4/test-command"]; ["chmod"; "0o755"; "/command4/test-command"]; ["command"; "/command4/test-command 4"]], "\nResult4\n"), []; - InitScratchFS, Always, TestResultString ( + InitScratchFS, IfNotCrossAppliance, TestResultString ( [["mkdir"; "/command5"]; ["upload"; "test-command"; "/command5/test-command"]; ["chmod"; "0o755"; "/command5/test-command"]; ["command"; "/command5/test-command 5"]], "\nResult5\n\n"), []; - InitScratchFS, Always, TestResultString ( + InitScratchFS, IfNotCrossAppliance, TestResultString ( [["mkdir"; "/command6"]; ["upload"; "test-command"; "/command6/test-command"]; ["chmod"; "0o755"; "/command6/test-command"]; ["command"; "/command6/test-command 6"]], "\n\nResult6\n\n"), []; - InitScratchFS, Always, TestResultString ( + InitScratchFS, IfNotCrossAppliance, TestResultString ( [["mkdir"; "/command7"]; ["upload"; "test-command"; "/command7/test-command"]; ["chmod"; "0o755"; "/command7/test-command"]; ["command"; "/command7/test-command 7"]], ""), []; - InitScratchFS, Always, TestResultString ( + InitScratchFS, IfNotCrossAppliance, TestResultString ( [["mkdir"; "/command8"]; ["upload"; "test-command"; "/command8/test-command"]; ["chmod"; "0o755"; "/command8/test-command"]; ["command"; "/command8/test-command 8"]], "\n"), []; - InitScratchFS, Always, TestResultString ( + InitScratchFS, IfNotCrossAppliance, TestResultString ( [["mkdir"; "/command9"]; ["upload"; "test-command"; "/command9/test-command"]; ["chmod"; "0o755"; "/command9/test-command"]; ["command"; "/command9/test-command 9"]], "\n\n"), []; - InitScratchFS, Always, TestResultString ( + InitScratchFS, IfNotCrossAppliance, TestResultString ( [["mkdir"; "/command10"]; ["upload"; "test-command"; "/command10/test-command"]; ["chmod"; "0o755"; "/command10/test-command"]; ["command"; "/command10/test-command 10"]], "Result10-1\nResult10-2\n"), []; - InitScratchFS, Always, TestResultString ( + InitScratchFS, IfNotCrossAppliance, TestResultString ( [["mkdir"; "/command11"]; ["upload"; "test-command"; "/command11/test-command"]; ["chmod"; "0o755"; "/command11/test-command"]; ["command"; "/command11/test-command 11"]], "Result11-1\nResult11-2"), []; - InitScratchFS, Always, TestLastFail ( + InitScratchFS, IfNotCrossAppliance, TestLastFail ( [["mkdir"; "/command12"]; ["upload"; "test-command"; "/command12/test-command"]; ["chmod"; "0o755"; "/command12/test-command"]; ["command"; "/command12/test-command"]]), []; - InitScratchFS, Always, TestResultString ( + InitScratchFS, IfNotCrossAppliance, TestResultString ( [["mkdir"; "/pwd"]; ["upload"; "test-pwd"; "/pwd/test-pwd"]; ["chmod"; "0o755"; "/pwd/test-pwd"]; @@ -4340,67 +4340,67 @@ locations." }; proc_nr = Some 51; protocol_limit_warning = true; tests = [ - InitScratchFS, Always, TestResult ( + InitScratchFS, IfNotCrossAppliance, TestResult ( [["mkdir"; "/command_lines"]; ["upload"; "test-command"; "/command_lines/test-command"]; ["chmod"; "0o755"; "/command_lines/test-command"]; ["command_lines"; "/command_lines/test-command 1"]], "is_string_list (ret, 1, \"Result1\")"), []; - InitScratchFS, Always, TestResult ( + InitScratchFS, IfNotCrossAppliance, TestResult ( [["mkdir"; "/command_lines2"]; ["upload"; "test-command"; "/command_lines2/test-command"]; ["chmod"; "0o755"; "/command_lines2/test-command"]; ["command_lines"; "/command_lines2/test-command 2"]], "is_string_list (ret, 1, \"Result2\")"), []; - InitScratchFS, Always, TestResult ( + InitScratchFS, IfNotCrossAppliance, TestResult ( [["mkdir"; "/command_lines3"]; ["upload"; "test-command"; "/command_lines3/test-command"]; ["chmod"; "0o755"; "/command_lines3/test-command"]; ["command_lines"; "/command_lines3/test-command 3"]], "is_string_list (ret, 2, \"\", \"Result3\")"), []; - InitScratchFS, Always, TestResult ( + InitScratchFS, IfNotCrossAppliance, TestResult ( [["mkdir"; "/command_lines4"]; ["upload"; "test-command"; "/command_lines4/test-command"]; ["chmod"; "0o755"; "/command_lines4/test-command"]; ["command_lines"; "/command_lines4/test-command 4"]], "is_string_list (ret, 2, \"\", \"Result4\")"), []; - InitScratchFS, Always, TestResult ( + InitScratchFS, IfNotCrossAppliance, TestResult ( [["mkdir"; "/command_lines5"]; ["upload"; "test-command"; "/command_lines5/test-command"]; ["chmod"; "0o755"; "/command_lines5/test-command"]; ["command_lines"; "/command_lines5/test-command 5"]], "is_string_list (ret, 3, \"\", \"Result5\", \"\")"), []; - InitScratchFS, Always, TestResult ( + InitScratchFS, IfNotCrossAppliance, TestResult ( [["mkdir"; "/command_lines6"]; ["upload"; "test-command"; "/command_lines6/test-command"]; ["chmod"; "0o755"; "/command_lines6/test-command"]; ["command_lines"; "/command_lines6/test-command 6"]], "is_string_list (ret, 4, \"\", \"\", \"Result6\", \"\")"), []; - InitScratchFS, Always, TestResult ( + InitScratchFS, IfNotCrossAppliance, TestResult ( [["mkdir"; "/command_lines7"]; ["upload"; "test-command"; "/command_lines7/test-command"]; ["chmod"; "0o755"; "/command_lines7/test-command"]; ["command_lines"; "/command_lines7/test-command 7"]], "is_string_list (ret, 0)"), []; - InitScratchFS, Always, TestResult ( + InitScratchFS, IfNotCrossAppliance, TestResult ( [["mkdir"; "/command_lines8"]; ["upload"; "test-command"; "/command_lines8/test-command"]; ["chmod"; "0o755"; "/command_lines8/test-command"]; ["command_lines"; "/command_lines8/test-command 8"]], "is_string_list (ret, 1, \"\")"), []; - InitScratchFS, Always, TestResult ( + InitScratchFS, IfNotCrossAppliance, TestResult ( [["mkdir"; "/command_lines9"]; ["upload"; "test-command"; "/command_lines9/test-command"]; ["chmod"; "0o755"; "/command_lines9/test-command"]; ["command_lines"; "/command_lines9/test-command 9"]], "is_string_list (ret, 2, \"\", \"\")"), []; - InitScratchFS, Always, TestResult ( + InitScratchFS, IfNotCrossAppliance, TestResult ( [["mkdir"; "/command_lines10"]; ["upload"; "test-command"; "/command_lines10/test-command"]; ["chmod"; "0o755"; "/command_lines10/test-command"]; ["command_lines"; "/command_lines10/test-command 10"]], "is_string_list (ret, 2, \"Result10-1\", \"Result10-2\")"), []; - InitScratchFS, Always, TestResult ( + InitScratchFS, IfNotCrossAppliance, TestResult ( [["mkdir"; "/command_lines11"]; ["upload"; "test-command"; "/command_lines11/test-command"]; ["chmod"; "0o755"; "/command_lines11/test-command"];