mirror of
				https://github.com/tiagovignatti/intel-gpu-tools.git
				synced 2025-11-04 03:58:27 +00:00 
			
		
		
		
	tests: dont polute stderr if the test succeeds/skips
Results in spurious 'warn' results in piglit. Also don't print progress indicators when not outputting to a terminal. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
		
							parent
							
								
									4fae0c65c5
								
							
						
					
					
						commit
						021909e10d
					
				@ -543,6 +543,9 @@ void drmtest_progress(const char *header, uint64_t i, uint64_t total)
 | 
			
		||||
{
 | 
			
		||||
	int divider = 200;
 | 
			
		||||
 | 
			
		||||
	if (!isatty(fileno(stderr)))
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
	if (i+1 >= total) {
 | 
			
		||||
		fprintf(stderr, "\r%s100%%\n", header);
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
@ -209,7 +209,7 @@ int main(int argc, char **argv)
 | 
			
		||||
		drmtest_progress("gem_cpu_reloc: ", 2*count+i, 3*count);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	fprintf(stderr, "Test suceeded, cleanup up - this might take a while.\n");
 | 
			
		||||
	printf("Test suceeded, cleanup up - this might take a while.\n");
 | 
			
		||||
	close(fd);
 | 
			
		||||
 | 
			
		||||
	return 0;
 | 
			
		||||
 | 
			
		||||
@ -163,7 +163,7 @@ int main(int argc, char **argv)
 | 
			
		||||
		drmtest_progress("gem_cs_prefetch: ", i, count);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	fprintf(stderr, "Test suceeded, cleanup up - this might take a while.\n");
 | 
			
		||||
	printf("Test suceeded, cleanup up - this might take a while.\n");
 | 
			
		||||
	drm_intel_bufmgr_destroy(bufmgr);
 | 
			
		||||
 | 
			
		||||
	close(fd);
 | 
			
		||||
 | 
			
		||||
@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 | 
			
		||||
 | 
			
		||||
	ret = drmIoctl(fd, CONTEXT_CREATE_IOCTL, &create);
 | 
			
		||||
	if (ret != 0 && (errno == ENODEV || errno == EINVAL)) {
 | 
			
		||||
		fprintf(stderr, "Kernel is too old, or contexts not supported: %s\n",
 | 
			
		||||
		printf("Kernel is too old, or contexts not supported: %s\n",
 | 
			
		||||
			strerror(errno));
 | 
			
		||||
		exit(77);
 | 
			
		||||
	} else if (ret != 0) {
 | 
			
		||||
 | 
			
		||||
@ -147,7 +147,7 @@ int main(int argc, char *argv[])
 | 
			
		||||
		assert(ret != -1);
 | 
			
		||||
		junk->filp = fopen(path, junk->mode);
 | 
			
		||||
		if (junk->filp == NULL) {
 | 
			
		||||
			fprintf(stderr, "Kernel is too old. GTFO\n");
 | 
			
		||||
			printf("Kernel is too old. GTFO\n");
 | 
			
		||||
			exit(77);
 | 
			
		||||
		}
 | 
			
		||||
		val = readval(junk->filp);
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user