tests: move non-existent to error_returns dir

captain5050 · Oct 11, 2013 · 438eced · 438eced
1 parent 56a06f8
commit 438eced
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 22 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,6 @@
 11 October 2013
-+ Add tests/errors/e2big
++ Add tests/error_returns/e2big
++ Move non-existent test to tests/error_returns
 
 18 September 2013
 + Fix breakpoint_support test that was broken by too-clever gcc 4.8

diff --git a/run_tests.sh b/run_tests.sh
@@ -57,9 +57,6 @@ echo "* Checking basic perf_event functionality"
 echo "  + $TESTS_DIR/validation/format_id_support"
 echo -n "    "
 $TESTS_DIR/validation/format_id_support
-echo "  + $TESTS_DIR/validation/non-existent"
-echo -n "    "
-$TESTS_DIR/validation/non-existent
 echo "  + $TESTS_DIR/validation/breakpoint_support"
 echo -n "    "
 $TESTS_DIR/validation/breakpoint_support
@@ -86,7 +83,10 @@ echo
 echo "* Checking error returns"
 echo "  + $TESTS_DIR/error_returns/e2big"
 echo -n "    "
-$TESTS_DIR/errors/e2big
+$TESTS_DIR/error_returns/e2big
+echo "  + $TESTS_DIR/error_returns/non-existent"
+echo -n "    "
+$TESTS_DIR/error_returns/non-existent
 
 echo
 echo "* Checking overflow functionality"

diff --git a/tests/error_returns/Makefile b/tests/error_returns/Makefile
@@ -4,7 +4,8 @@ LFLAGS =
 LIB = ../../lib
 
 all:	\
-	e2big
+	e2big \
+	non-existent
 
 ###
 
@@ -36,6 +37,21 @@ e2big.o:	e2big.c
 
 ###
 
+non-existent:	non-existent.o $(LIB)/test_utils.o \
+				$(LIB)/perf_helpers.o \
+				$(LIB)/matrix_multiply.o
+	$(CC) $(LFLAGS) -o non-existent non-existent.o \
+				$(LIB)/test_utils.o \
+				$(LIB)/perf_helpers.o \
+				$(LIB)/matrix_multiply.o
+
+non-existent.o:	non-existent.c
+	$(CC) $(CFLAGS) -c non-existent.c
+
+###
+
+
 clean:	
 	rm -f *~ *.o \
-		e2big
+		e2big \
+		non-existent
diff --git a/tests/validation/non-existent.c → tests/error_returns/non-existent.c b/tests/validation/non-existent.c → tests/error_returns/non-existent.c
diff --git a/tests/validation/Makefile b/tests/validation/Makefile
@@ -11,7 +11,6 @@ all:	\
 	get_cache_info \
 	inherit \
 	inherit_stat \
-	non-existent \
 	offcore_response \
 	offcore_response_mask \
 	rdpmc_support \
@@ -127,19 +126,6 @@ inherit_stat.o:	inherit_stat.c
 
 ###
 
-non-existent:	non-existent.o $(LIB)/test_utils.o \
-					$(LIB)/perf_helpers.o \
-					$(LIB)/matrix_multiply.o
-	$(CC) $(LFLAGS) -o non-existent non-existent.o \
-				$(LIB)/test_utils.o \
-				$(LIB)/perf_helpers.o \
-				$(LIB)/matrix_multiply.o
-
-non-existent.o:	non-existent.c
-	$(CC) $(CFLAGS) -c non-existent.c
-
-###
-
 enable_on_exec:	enable_on_exec.o $(LIB)/test_utils.o \
 					$(LIB)/perf_helpers.o \
 					$(LIB)/instructions_testcode.o
@@ -202,7 +188,6 @@ clean:
 	get_cache_info \
 	inherit \
 	inherit_stat \
-	non-existent \
 	offcore_response \
 	offcore_response_mask \
 	rdpmc_support \