Add --exact, --no-deps, or --no-prune to trim tests as needed

By explicitly specifying --exact, --no-deps, or --no-prune these tests
are now immune from any change in the default behavior of "apitrace
trim". Whether --exact or --auto is the default, these tests will get
exactly the behavior they want.

diff --git a/cli/cli-trim-no-side-effects-prune.script b/cli/cli-trim-no-side-effects-prune.script
index 9710f1c40e6c9633daa7563fea22a73ab66cc35f..658b5784913a8dd6b70dcfafa2d2851e800da819 100644 (file)
--- a/cli/cli-trim-no-side-effects-prune.script
+++ b/cli/cli-trim-no-side-effects-prune.script
@@ -1,7 +1,7 @@
 # Verify that "trim --prune" drops calls with no side effects
 
 # Tell trim to trim to the entire trace, but pruning calls
-apitrace trim --prune few-side-effects.trace
+apitrace trim --no-deps --prune few-side-effects.trace
 
 # Verify that we actually trimmed what we wanted to (just calls with
 # no side effects)

diff --git a/cli/cli-trim-no-side-effects-trim.script b/cli/cli-trim-no-side-effects-trim.script
index 179df9817671b6b543b4cfcf06110ad8a0328ab6..ecc5ec8eae56f8e5056c9b8fb97f49d9139fcca9 100644 (file)
--- a/cli/cli-trim-no-side-effects-trim.script
+++ b/cli/cli-trim-no-side-effects-trim.script
@@ -4,7 +4,7 @@
 # Trim trace to frame 1, but dropping calls from first frame 0 with no
 # side effects.
 
-apitrace trim --deps --trim-spec=no-side-effects --frames=1 few-side-effects.trace
+apitrace trim --no-prune --deps --trim-spec=no-side-effects --frames=1 few-side-effects.trace
 
 # Verify that we actually trimmed what we wanted to (just calls with
 # no side effects)

diff --git a/traces/trim-frame-set.script b/traces/trim-frame-set.script
index 33293c3c26bde85770d30570ab46ce9b7f106db7..2adade99493dd25e94e5f300c076911cc4886213 100644 (file)
--- a/traces/trim-frame-set.script
+++ b/traces/trim-frame-set.script
@@ -1,4 +1,4 @@
-trim --frames=0-5/draw,0-5/frame glxsimple.trace
+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)

diff --git a/traces/trim-frames-and-calls.script b/traces/trim-frames-and-calls.script
index c9a0084a64a0ac06b5d7def8b0087cd1f33bf71f..51334417858c52d86c76e898c73fa70571bafa65 100644 (file)
--- a/traces/trim-frames-and-calls.script
+++ b/traces/trim-frames-and-calls.script
@@ -1,4 +1,4 @@
-trim -o trim-frames-and-calls-trim.trace --frames=5/frame --calls=2 glxsimple.trace
+trim --exact -o trim-frames-and-calls-trim.trace --frames=5/frame --calls=2 glxsimple.trace
 dump --verbose trim-frames-and-calls-trim.trace
 0 glXMakeCurrent(dpy = 0x236a280, drawable = 41943041, ctx = 0x2384330) = True
 1 glXSwapBuffers(dpy = 0x236a280, drawable = 41943041)

diff --git a/traces/trim-identity.script b/traces/trim-identity.script
index 4370211a6e29b16af135d8aaebc7d3d5a3d32ec2..b3daca1875ce2878e026205d9fd1af8d90b75826 100644 (file)
--- a/traces/trim-identity.script
+++ b/traces/trim-identity.script
@@ -1,4 +1,4 @@
-trim -o trim-identity.src.trace tri.trace
+trim --exact -o trim-identity.src.trace tri.trace
 dump --verbose trim-identity.src.trace
 0 glXQueryExtension(dpy = 0xfc52b0, errorb = NULL, event = NULL) = True
 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}

diff --git a/traces/trim-range.script b/traces/trim-range.script
index 9b216d520bf5b0e4382f3d7f0fe1bebf329d462b..f605f45803de0ccff0dcd2ee6e7e42bdd4934d93 100644 (file)
--- a/traces/trim-range.script
+++ b/traces/trim-range.script
@@ -1,4 +1,4 @@
-trim -o trim-range.src.trace --calls=3-5,7,4-6,2 tri.trace
+trim --exact -o trim-range.src.trace --calls=3-5,7,4-6,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

diff --git a/traces/trim-thread.script b/traces/trim-thread.script
index 0d33ab13d1f1a8480fb2aa60a266771c2e4bf301..d476f48fbc57d56494c64944fc46245dcba67acb 100644 (file)
--- a/traces/trim-thread.script
+++ b/traces/trim-thread.script
@@ -1,4 +1,4 @@
-trim -o trim-thread.src.trace --thread=1 glthreads.trace
+trim --exact -o trim-thread.src.trace --thread=1 glthreads.trace
 dump --verbose --thread-ids --call-nos=no trim-thread.src.trace
 1 glXMakeCurrent(dpy = 0x751280, drawable = 62914565, ctx = 0xa99be0) = True
 1 glGetString(name = GL_RENDERER) = "Mesa DRI Mobile Intel\2\556 GM45 Express Chipset "