[PATCH] apitrace-tests: Test multiple "--calls" and/or "--frames" command-line options

[Lawrence L Love]

Tests to go along with patch:

[PATCH] apitrace: Allow multiple --calls and/or --frames input options

These tests were taken from existing tests with "multi-" prefixed to the name.
The apitrace call is taken from the original with the --call or --frame option
split into multiple options but covering the same ranges. Hence the results
should be the same as the original.

Signed-off-by: Lawrence L Love <lawrencex.l.love at intel.com>
---
 traces/multi-callset-file.script   |  6 ++++++
 traces/multi-callset_1.calls       |  2 ++
 traces/multi-callset_2.calls       |  1 +
 traces/multi-trim-frame-set.script | 20 ++++++++++++++++++++
 traces/multi-trim-head.script      | 14 ++++++++++++++
 traces/multi-trim-range.script     |  8 ++++++++
 6 files changed, 51 insertions(+)
 create mode 100644 traces/multi-callset-file.script
 create mode 100644 traces/multi-callset_1.calls
 create mode 100644 traces/multi-callset_2.calls
 create mode 100644 traces/multi-trim-frame-set.script
 create mode 100644 traces/multi-trim-head.script
 create mode 100644 traces/multi-trim-range.script

diff --git a/traces/multi-callset-file.script b/traces/multi-callset-file.script
new file mode 100644
index 0000000..bcfd0aa
--- /dev/null
+++ b/traces/multi-callset-file.script
@@ -0,0 +1,6 @@
+dump --verbose --calls=@multi-callset_1.calls --calls=@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/multi-callset_1.calls b/traces/multi-callset_1.calls
new file mode 100644
index 0000000..3d95bde
--- /dev/null
+++ b/traces/multi-callset_1.calls
@@ -0,0 +1,2 @@
+1
+3-5/2
diff --git a/traces/multi-callset_2.calls b/traces/multi-callset_2.calls
new file mode 100644
index 0000000..83fbca4
--- /dev/null
+++ b/traces/multi-callset_2.calls
@@ -0,0 +1 @@
+*/frame
diff --git a/traces/multi-trim-frame-set.script b/traces/multi-trim-frame-set.script
new file mode 100644
index 0000000..1e54cf5
--- /dev/null
+++ b/traces/multi-trim-frame-set.script
@@ -0,0 +1,20 @@
+trim --exact --frames=0-5/draw --frames=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-trim-head.script b/traces/multi-trim-head.script
new file mode 100644
index 0000000..3a5f4eb
--- /dev/null
+++ b/traces/multi-trim-head.script
@@ -0,0 +1,14 @@
+trim -o trim-head.src.trace --auto --calls=0-20 --calls=21-800 --calls=801-843 glxsimple.trace
+dump --verbose trim-head.src.trace
+0 glXChooseVisual(dpy = 0x236a280, screen = 0, attribList = {GLX_RGBA, GLX_RED_SIZE, GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_RED_SIZE, GLX_BLUE_SIZE, GLX_RED_SIZE, GLX_ALPHA_SIZE, GLX_RED_SIZE, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, GLX_RED_SIZE, GLX_X_VISUAL_TYPE, GLX_DIRECT_COLOR, 0}) = &{visual = 0x2374ef8, visualid = 34, screen = 0, depth = 24, c_class = 5, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}
+1 glXCreateContext(dpy = 0x236a280, vis = &{visual = 0x2374ef8, visualid = 34, screen = 0, depth = 24, c_class = 5, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}, shareList = NULL, direct = True) = 0x2384330
+2 glXMakeCurrent(dpy = 0x236a280, drawable = 41943041, ctx = 0x2384330) = True
+3 glViewport(x = 0, y = 0, width = 64, height = 64)
+4 glMatrixMode(mode = GL_PROJECTION)
+5 glLoadIdentity()
+6 glOrtho(left = 0, right = 64, bottom = 64, top = 0, zNear = 0, zFar = 1)
+7 glMatrixMode(mode = GL_MODELVIEW)
+8 glClearColor(red = 0, green = 0, blue = 1, alpha = 1)
+9 glClear(mask = GL_COLOR_BUFFER_BIT)
+10 glXSwapBuffers(dpy = 0x236a280, drawable = 41943041)
+
diff --git a/traces/multi-trim-range.script b/traces/multi-trim-range.script
new file mode 100644
index 0000000..2c53f18
--- /dev/null
+++ b/traces/multi-trim-range.script
@@ -0,0 +1,8 @@
+trim --exact -o trim-range.src.trace --calls=3-5 --calls=7 --calls=4-6 --calls=2 tri.trace
+dump --verbose trim-range.src.trace
+0 glXGetVisualFromFBConfig(dpy = 0xfc52b0, config = 0xfe3620) = &{visual = 0xfd00e8, visualid = 154, screen = 0, depth = 24, c_class = 4, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}
+1 glXCreateNewContext(dpy = 0xfc52b0, config = 0xfe3620, renderType = GLX_RGBA_TYPE, shareList = NULL, direct = True) = 0xfdd650
+2 glXIsDirect(dpy = 0xfc52b0, ctx = 0xfdd650) = True
+3 glXMakeContextCurrent(dpy = 0xfc52b0, draw = 44040194, read = 44040194, ctx = 0xfdd650) = True
+4 glXMakeContextCurrent(dpy = 0xfc52b0, draw = 44040194, read = 44040194, ctx = 0xfdd650) = True
+5 glGetString(name = GL_RENDERER) = "Mesa DRI Mobile Intel\2\556 GM45 Express Chipset "
-- 
1.8.4.rc3