s/drmtest_/igt_/

Requested-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

tests/gem_caching.c

@@ -94,7 +94,7 @@ blt_bo_fill(drm_intel_bo *tmp_bo, drm_intel_bo *bo, uint8_t val)
 
 	if (bo->offset < mappable_gtt_limit &&
 	    (IS_G33(devid) || intel_gen(devid) >= 4))
-		drmtest_trash_aperture();
+		igt_trash_aperture();
 
 	copy_bo(tmp_bo, bo);
 }
@@ -111,8 +111,8 @@ int main(int argc, char **argv)
 	uint8_t *cpu_ptr;
 	uint8_t *gtt_ptr;
 
-	drmtest_subtest_init(argc, argv);
-	drmtest_skip_on_simulation();
+	igt_subtest_init(argc, argv);
+	igt_skip_on_simulation();
 
 	srandom(0xdeadbeef);
 
@@ -138,12 +138,12 @@ int main(int argc, char **argv)
 
 	staging_bo = drm_intel_bo_alloc(bufmgr, "staging bo", BO_SIZE, 4096);
 
-	drmtest_init_aperture_trashers(bufmgr);
+	igt_init_aperture_trashers(bufmgr);
 	mappable_gtt_limit = gem_mappable_aperture_size();
 
-	drmtest_subtest("reads") {
+	igt_subtest("reads") {
 		if (!(flags & TEST_READ))
-			drmtest_skip();
+			igt_skip();
 
 		printf("checking partial reads\n");
 
@@ -167,13 +167,13 @@ int main(int argc, char **argv)
 			}
 			drm_intel_bo_unmap(scratch_bo);
 
-			drmtest_progress("partial reads test: ", i, ROUNDS);
+			igt_progress("partial reads test: ", i, ROUNDS);
 		}
 	}
 
-	drmtest_subtest("writes") {
+	igt_subtest("writes") {
 		if (!(flags & TEST_WRITE))
-			drmtest_skip();
+			igt_skip();
 
 		printf("checking partial writes\n");
 
@@ -219,13 +219,13 @@ int main(int argc, char **argv)
 			}
 			drm_intel_gem_bo_unmap_gtt(staging_bo);
 
-			drmtest_progress("partial writes test: ", i, ROUNDS);
+			igt_progress("partial writes test: ", i, ROUNDS);
 		}
 	}
 
-	drmtest_subtest("read-writes") {
+	igt_subtest("read-writes") {
 		if (!((flags & TEST_BOTH) == TEST_BOTH))
-			drmtest_skip();
+			igt_skip();
 
 		printf("checking partial writes after partial reads\n");
 
@@ -292,14 +292,14 @@ int main(int argc, char **argv)
 			drm_intel_gem_bo_unmap_gtt(staging_bo);
 			drm_intel_bo_unmap(scratch_bo);
 
-			drmtest_progress("partial read/writes test: ", i, ROUNDS);
+			igt_progress("partial read/writes test: ", i, ROUNDS);
 		}
 	}
 
-	drmtest_cleanup_aperture_trashers();
+	igt_cleanup_aperture_trashers();
 	drm_intel_bufmgr_destroy(bufmgr);
 
 	close(fd);
 
-	return drmtest_retval();
+	return igt_retval();
 }