Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b03fc1d authored by Sam bobroff's avatar Sam bobroff Committed by Michael Ellerman
Browse files

selftests/powerpc: Move get_auxv_entry() to harness.c 



Move get_auxv_entry() from pmu/lib.c up to harness.c in order to make
it available to other tests.

Signed-off-by: default avatarSam Bobroff <sam.bobroff@au1.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent feba4036

tools/testing/selftests/powerpc/harness.c

+47 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ 
#include <sys/types.h>

#include <sys/wait.h>

#include <unistd.h>

#include <elf.h>

#include <fcntl.h>

#include <link.h>

#include <sys/stat.h>



#include "subunit.h"

#include "utils.h"
@@ -112,3 +116,46 @@ int test_harness(int (test_function)(void), char *name) 


	return rc;

}



static char auxv[4096];



void *get_auxv_entry(int type)

{

	ElfW(auxv_t) *p;

	void *result;

	ssize_t num;

	int fd;



	fd = open("/proc/self/auxv", O_RDONLY);

	if (fd == -1) {

		perror("open");

		return NULL;

	}



	result = NULL;



	num = read(fd, auxv, sizeof(auxv));

	if (num < 0) {

		perror("read");

		goto out;

	}



	if (num > sizeof(auxv)) {

		printf("Overflowed auxv buffer\n");

		goto out;

	}



	p = (ElfW(auxv_t) *)auxv;



	while (p->a_type != AT_NULL) {

		if (p->a_type == type) {

			result = (void *)p->a_un.a_val;

			break;

		}



		p++;

	}

out:

	close(fd);

	return result;

}

tools/testing/selftests/powerpc/pmu/lib.c

+0 −47
Original line number Diff line number Diff line
@@ -5,15 +5,10 @@ 


#define _GNU_SOURCE	/* For CPU_ZERO etc. */



#include <elf.h>

#include <errno.h>

#include <fcntl.h>

#include <link.h>

#include <sched.h>

#include <setjmp.h>

#include <stdlib.h>

#include <sys/stat.h>

#include <sys/types.h>

#include <sys/wait.h>



#include "utils.h"
@@ -256,45 +251,3 @@ bool require_paranoia_below(int level) 
	return rc;

}

static char auxv[4096];



void *get_auxv_entry(int type)

{

	ElfW(auxv_t) *p;

	void *result;

	ssize_t num;

	int fd;



	fd = open("/proc/self/auxv", O_RDONLY);

	if (fd == -1) {

		perror("open");

		return NULL;

	}



	result = NULL;



	num = read(fd, auxv, sizeof(auxv));

	if (num < 0) {

		perror("read");

		goto out;

	}



	if (num > sizeof(auxv)) {

		printf("Overflowed auxv buffer\n");

		goto out;

	}



	p = (ElfW(auxv_t) *)auxv;



	while (p->a_type != AT_NULL) {

		if (p->a_type == type) {

			result = (void *)p->a_un.a_val;

			break;

		}



		p++;

	}

out:

	close(fd);

	return result;

}

tools/testing/selftests/powerpc/pmu/lib.h

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ extern int notify_parent(union pipe write_pipe); 
extern int notify_parent_of_error(union pipe write_pipe);

extern pid_t eat_cpu(int (test_function)(void));

extern bool require_paranoia_below(int level);

extern void *get_auxv_entry(int type);



struct addr_range {

	uint64_t first, last;

tools/testing/selftests/powerpc/utils.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ typedef uint8_t u8; 




int test_harness(int (test_function)(void), char *name);



extern void *get_auxv_entry(int type);



/* Yes, this is evil */

#define FAIL_IF(x)						\