BTests & baselines for testing selective skipping of script optimization

testing/btest/Baseline.cpp/language.skip-opt1/out

@@ -0,0 +1,9 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+always: function() : void
+compiled-C++ 
+no_ZAM: function() : void
+compiled-C++ 
+no_CPP: function() : void
+{ 
+print no CPP;
+}

testing/btest/Baseline.cpp/language.skip-opt2/out

@@ -0,0 +1,11 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+always: function() : void
+{ 
+print always;
+}
+no_ZAM: function() : void
+compiled-C++ 
+no_CPP: function() : void
+{ 
+print no CPP;
+}

testing/btest/Baseline.zam/language.skip-opt1/out

@@ -0,0 +1,9 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+always: function() : void
+ZAM-code always
+no_ZAM: function() : void
+{ 
+print no ZAM;
+}
+no_CPP: function() : void
+ZAM-code no_CPP

testing/btest/Baseline.zam/language.skip-opt2/out

@@ -0,0 +1,11 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+always: function() : void
+{ 
+print always;
+}
+no_ZAM: function() : void
+{ 
+print no ZAM;
+}
+no_CPP: function() : void
+ZAM-code no_CPP

testing/btest/Baseline/language.skip-opt1/out

@@ -0,0 +1,13 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+always: function() : void
+{ 
+print always;
+}
+no_ZAM: function() : void
+{ 
+print no ZAM;
+}
+no_CPP: function() : void
+{ 
+print no CPP;
+}

testing/btest/Baseline/language.skip-opt2/out

@@ -0,0 +1,13 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+always: function() : void
+{ 
+print always;
+}
+no_ZAM: function() : void
+{ 
+print no ZAM;
+}
+no_CPP: function() : void
+{ 
+print no CPP;
+}

testing/btest/Baseline/language.skip-opt3/out

@@ -0,0 +1,13 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+always: function() : void
+{ 
+print always;
+}
+no_ZAM: function() : void
+{ 
+print no ZAM;
+}
+no_CPP: function() : void
+{ 
+print no CPP;
+}

testing/btest/Baseline/opt.opt-skip-files/output

@@ -0,0 +1,6 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+I shouldn't be ZAM code!
+my_test: function() : void
+{ 
+print I shouldn't be ZAM code!;
+}

testing/btest/Baseline/opt.opt-skip-funcs/output

@@ -0,0 +1,6 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+I shouldn't be ZAM code!
+my_test: function() : void
+{ 
+print I shouldn't be ZAM code!;
+}

testing/btest/Baseline/opt.opt-skip-funcs2/output

@@ -0,0 +1,6 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+I shouldn't be ZAM code!
+my_test: function() : void
+{ 
+print I shouldn't be ZAM code!;
+}

testing/btest/Baseline/opt.opt-skip-other-file/output

@@ -0,0 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+I should be ZAM code!
+my_test: function() : void
+ZAM-code my_test

testing/btest/Baseline/opt.opt-skip-other-func/output

@@ -0,0 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+I should be ZAM code!
+my_test: function() : void
+ZAM-code my_test

testing/btest/language/skip-opt1.zeek

@@ -0,0 +1,24 @@
+# @TEST-EXEC: zeek -b %INPUT >out 2>&1
+# @TEST-EXEC: btest-diff out
+
+function always()
+	{
+	print "always";
+	}
+
+function no_ZAM() &no_ZAM_opt
+	{
+	print "no ZAM";
+	}
+
+function no_CPP() &no_CPP_opt
+	{
+	print "no CPP";
+	}
+
+event zeek_init()
+	{
+	print always;
+	print no_ZAM;
+	print no_CPP;
+	}

testing/btest/language/skip-opt2.zeek

@@ -0,0 +1,24 @@
+# @TEST-EXEC: zeek -b %INPUT --no-opt-func=always >out 2>&1
+# @TEST-EXEC: btest-diff out
+
+function always()
+	{
+	print "always";
+	}
+
+function no_ZAM() &no_ZAM_opt
+	{
+	print "no ZAM";
+	}
+
+function no_CPP() &no_CPP_opt
+	{
+	print "no CPP";
+	}
+
+event zeek_init()
+	{
+	print always;
+	print no_ZAM;
+	print no_CPP;
+	}

testing/btest/language/skip-opt3.zeek

@@ -0,0 +1,24 @@
+# @TEST-EXEC: zeek -b %INPUT --no-opt-file=skip-opt >out 2>&1
+# @TEST-EXEC: btest-diff out
+
+function always()
+	{
+	print "always";
+	}
+
+function no_ZAM() &no_ZAM_opt
+	{
+	print "no ZAM";
+	}
+
+function no_CPP() &no_CPP_opt
+	{
+	print "no CPP";
+	}
+
+event zeek_init()
+	{
+	print always;
+	print no_ZAM;
+	print no_CPP;
+	}

testing/btest/opt/opt-files.zeek

@@ -1,5 +1,5 @@
 # @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
-# @TEST-EXEC: zeek -b -O ZAM --optimize-files='opt-files' %INPUT >output
+# @TEST-EXEC: zeek -b -O ZAM --optimize-files=opt-files %INPUT >output
 # @TEST-EXEC: btest-diff output
 
 # Tests that we can selectively pick this file.

testing/btest/opt/opt-files2.zeek

@@ -1,5 +1,5 @@
 # @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
-# @TEST-EXEC: zeek -b -O ZAM --optimize-files='base/utils' %INPUT >output
+# @TEST-EXEC: zeek -b -O ZAM --optimize-files=base/utils %INPUT >output
 # @TEST-EXEC: btest-diff output
 
 # Tests that we can selectively pick a group of files but not this one.

testing/btest/opt/opt-files3.zeek

@@ -1,8 +1,8 @@
 # @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
-# @TEST-EXEC: zeek -b -O ZAM --optimize-files='base/utils' --optimize-files='opt-files3' %INPUT >output
+# @TEST-EXEC: zeek -b -O ZAM --optimize-files=base/utils --optimize-files=opt-files3 %INPUT >output
 # @TEST-EXEC: btest-diff output
 
-# Tests that we can selectively pick a group of files *and* this one.
+# Tests that we can selectively pick a group of (other) files *and* this one.
 
 function my_test()
 	{

testing/btest/opt/opt-func.zeek

@@ -1,5 +1,5 @@
 # @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
-# @TEST-EXEC: zeek -b -O ZAM --optimize-func='my_test' %INPUT >output
+# @TEST-EXEC: zeek -b -O ZAM --optimize-func=my_test %INPUT >output
 # @TEST-EXEC: btest-diff output
 
 # Tests that we can selectively pick a given function.

testing/btest/opt/opt-func2.zeek

@@ -1,5 +1,5 @@
 # @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
-# @TEST-EXEC: zeek -b -O ZAM --optimize-func='another_test' %INPUT >output
+# @TEST-EXEC: zeek -b -O ZAM --optimize-func=another_test %INPUT >output
 # @TEST-EXEC: btest-diff output
 
 # Tests that we can selectively pick a bunch of functions (event handlers),

testing/btest/opt/opt-func3.zeek

@@ -1,5 +1,5 @@
 # @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
-# @TEST-EXEC: zeek -b -O ZAM --optimize-func='my_test' --optimize-func='another_test' %INPUT >output
+# @TEST-EXEC: zeek -b -O ZAM --optimize-func=my_test --optimize-func=another_test %INPUT >output
 # @TEST-EXEC: btest-diff output
 
 # Tests that we can selectively pick a bunch of functions (event handlers),

testing/btest/opt/opt-no-files.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC-FAIL: zeek -b -O ZAM --optimize-files='Xopt-files' %INPUT
+# @TEST-EXEC-FAIL: zeek -b -O ZAM --optimize-files=Xopt-files %INPUT
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
 
 # Make sure that if --optimize-files is specified but there are no matching

testing/btest/opt/opt-no-func.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC-FAIL: zeek -b -O ZAM --optimize-files='my_func' %INPUT
+# @TEST-EXEC-FAIL: zeek -b -O ZAM --optimize-files=my_func %INPUT
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
 
 # Make sure that if --optimize-func is specified but there are no matching

testing/btest/opt/opt-no-func2.zeek

@@ -1,4 +1,4 @@
-# @TEST-EXEC-FAIL: zeek -b -O ZAM --optimize-files='my_func' %INPUT
+# @TEST-EXEC-FAIL: zeek -b -O ZAM --optimize-files=my_func %INPUT
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
 
 # Make sure that --optimize-func anchors the regex.

testing/btest/opt/opt-skip-files.zeek

@@ -0,0 +1,16 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+# @TEST-EXEC: zeek -b -O ZAM --no-opt-files=opt-skip-files %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+# Tests that we can selectively exclude this file.
+
+function my_test()
+	{
+	print "I shouldn't be ZAM code!";
+	}
+
+event zeek_init()
+	{
+	my_test();
+	print my_test;
+	}

testing/btest/opt/opt-skip-files2.zeek

@@ -0,0 +1,16 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+# @TEST-EXEC-FAIL: zeek -b -O ZAM --no-opt-files=opt-skip-files --optimize-files=opt-skip-files %INPUT >output
+
+# Tests that skipping overrides including. This should result in an error
+# because there are no functions to compile.
+
+function my_test()
+	{
+	print "I shouldn't be ZAM code!";
+	}
+
+event zeek_init()
+	{
+	my_test();
+	print my_test;
+	}

testing/btest/opt/opt-skip-funcs.zeek

@@ -0,0 +1,16 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+# @TEST-EXEC: zeek -b -O ZAM --no-opt-func=my_test %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+# Tests that we can selectively exclude a function.
+
+function my_test()
+	{
+	print "I shouldn't be ZAM code!";
+	}
+
+event zeek_init()
+	{
+	my_test();
+	print my_test;
+	}

testing/btest/opt/opt-skip-funcs2.zeek

@@ -0,0 +1,16 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+# @TEST-EXEC: zeek -b -O ZAM --no-opt-func=my_test --optimize-func=my_test %INPUT --optimize-func=zeek_init >output
+# @TEST-EXEC: btest-diff output
+
+# Tests that skipping overrides including.
+
+function my_test()
+	{
+	print "I shouldn't be ZAM code!";
+	}
+
+event zeek_init()
+	{
+	my_test();
+	print my_test;
+	}

testing/btest/opt/opt-skip-other-file.zeek

@@ -0,0 +1,16 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+# @TEST-EXEC: zeek -b -O ZAM --no-opt-files=Xopt-skip-other-file %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+# Tests that if we exclude a different file, we still compile this one.
+
+function my_test()
+	{
+	print "I should be ZAM code!";
+	}
+
+event zeek_init()
+	{
+	my_test();
+	print my_test;
+	}

testing/btest/opt/opt-skip-other-func.zeek

@@ -0,0 +1,17 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+# @TEST-EXEC: zeek -b -O ZAM --no-opt-func=my_tes %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+# Tests that if we exclude a different function (given function matches
+# have to be full), we still compile this one.
+
+function my_test()
+	{
+	print "I should be ZAM code!";
+	}
+
+event zeek_init()
+	{
+	my_test();
+	print my_test;
+	}