[PATCH] apitrace-tests: Test comma-separated CALLSETs in "--calls" and "--frames" command-line options

[Lawrence L Love]

Tests to go along with patch:

[PATCH] apitrace: Allow comma separated lists in --calls and --frames options

These tests were taken from existing tests with the prefix "mix-"
prepended to the name. The apitrace call in the script is taken
from the original script except the --call or --frame option is separated
by commas into multiple options but covering the same ranges. Hence the
results should be the same as the original test.

Signed-off-by: Lawrence L Love <lawrencex.l.love at intel.com>
---
 traces/mix-callset-file.script   |  6 ++++++
 traces/mix-trim-frame-set.script | 20 ++++++++++++++++++++
 traces/multi-callset_1a.calls    |  1 +
 3 files changed, 27 insertions(+)
 create mode 100644 traces/mix-callset-file.script
 create mode 100644 traces/mix-trim-frame-set.script
 create mode 100644 traces/multi-callset_1a.calls

diff --git a/traces/mix-callset-file.script b/traces/mix-callset-file.script
new file mode 100644
index 0000000..9b50c8e
--- /dev/null
+++ b/traces/mix-callset-file.script
@@ -0,0 +1,6 @@
+dump --verbose --calls=@multi-callset_1a.calls,3-5/2, at multi-callset_2.calls tri.trace
+1 glXChooseFBConfig(dpy = 0xfc52b0, screen = 0, attribList = {GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1, GLX_BLUE_SIZE, 1, GLX_ALPHA_SIZE, 1, GLX_DOUBLEBUFFER, 1, 0}, nitems = &12) = {0xfe3620, 0xfe3710, 0xfe53e0, 0xfe54d0, 0xfe38f0, 0xfe39e0, 0xfe3e90, 0xfe56b0, 0xfe57a0, 0xfe5c50, 0xfe3f80, 0xfe5d40}
+3 glXCreateNewContext(dpy = 0xfc52b0, config = 0xfe3620, renderType = GLX_RGBA_TYPE, shareList = NULL, direct = True) = 0xfdd650
+5 glXMakeContextCurrent(dpy = 0xfc52b0, draw = 44040194, read = 44040194, ctx = 0xfdd650) = True
+30 glXSwapBuffers(dpy = 0xfc52b0, drawable = 44040194)
+
diff --git a/traces/mix-trim-frame-set.script b/traces/mix-trim-frame-set.script
new file mode 100644
index 0000000..2adade9
--- /dev/null
+++ b/traces/mix-trim-frame-set.script
@@ -0,0 +1,20 @@
+trim --exact --frames=0-5/draw,0-5/frame glxsimple.trace
+dump --verbose glxsimple-trim.trace
+0 glClear(mask = GL_COLOR_BUFFER_BIT)
+1 glXSwapBuffers(dpy = 0x236a280, drawable = 41943041)
+
+2 glEnd()
+3 glXSwapBuffers(dpy = 0x236a280, drawable = 41943041)
+
+4 glEnd()
+5 glXSwapBuffers(dpy = 0x236a280, drawable = 41943041)
+
+6 glClear(mask = GL_COLOR_BUFFER_BIT)
+7 glXSwapBuffers(dpy = 0x236a280, drawable = 41943041)
+
+8 glEnd()
+9 glXSwapBuffers(dpy = 0x236a280, drawable = 41943041)
+
+10 glEnd()
+11 glXSwapBuffers(dpy = 0x236a280, drawable = 41943041)
+
diff --git a/traces/multi-callset_1a.calls b/traces/multi-callset_1a.calls
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/traces/multi-callset_1a.calls
@@ -0,0 +1 @@
+1
-- 
1.8.4.rc3