tests2: cleanup

- remove -norunsrc switch Meaning and usage (-run -norun...???) look sort of screwed. Also general usefulness is unclear, so it was actually to support exactly one (not even very interesting) test This partially reverts e31579b0769e1f9c0947d12e83316d1149307b1a

grischka committed 12 years ago

Commit f90bad01 parent 76accfb5 files · +26 −32Browse files

Unified · Split

5 files

libtcc.c +1 −8
tcc.c +0 −1
tests/tests2/31_args.c +1 −1
tests/tests2/31_args.expect +5 −6
tests/tests2/Makefile +19 −16

libtcc.c+1−8

     TCC_OPTION_pedantic,
     TCC_OPTION_pthread,
     TCC_OPTION_run,
-    TCC_OPTION_norunsrc,
     TCC_OPTION_v,
     TCC_OPTION_w,
     TCC_OPTION_pipe,
     { "pedantic", TCC_OPTION_pedantic, 0},
     { "pthread", TCC_OPTION_pthread, 0},
     { "run", TCC_OPTION_run, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },
-    { "norunsrc", TCC_OPTION_norunsrc, 0 },
     { "rdynamic", TCC_OPTION_rdynamic, 0 },
     { "r", TCC_OPTION_r, 0 },
     { "s", TCC_OPTION_s, 0 },
     const TCCOption *popt;
     const char *optarg, *r;
     int run = 0;
-    int norunsrc = 0;
     int pthread = 0;
     int optind = 0;
         r = argv[optind++];
         if (r[0] != '-' || r[1] == '\0') {
             /* add a new file */
-            if (!run || !norunsrc)
+            dynarray_add((void ***)&s->files, &s->nb_files, tcc_strdup(r));
-              dynarray_add((void ***)&s->files, &s->nb_files, tcc_strdup(r));
             if (run) {
                 optind--;
                 /* argv[0] will be this file */
             tcc_set_options(s, optarg);
             run = 1;
             break;
-        case TCC_OPTION_norunsrc:
-            norunsrc = 1;
-            break;
         case TCC_OPTION_v:
             do ++s->verbose; while (*optarg++ == 'v');
             break;

tcc.c+0−1

@@ -69,7 +69,6 @@ static void help(void) · 68 unmodified lines
69	" -Bdir use 'dir' as tcc internal library and include path\n"	69	" -Bdir use 'dir' as tcc internal library and include path\n"
70	" -MD generate target dependencies for make\n"	70	" -MD generate target dependencies for make\n"
71	" -MF depfile put generated dependencies here\n"	71	" -MF depfile put generated dependencies here\n"
72	" -norunsrc Do not compile the file which is the first argument after -run.\n"
73	);	72	);
74	}	73	}
75		74

tests/tests2/31_args.c+1−1

@@ -5,7 +5,7 @@ int main(int argc, char **argv) · 4 unmodified lines
5	int Count;	5	int Count;
6		6
7	printf("hello world %d\n", argc);	7	printf("hello world %d\n", argc);
8	for (Count = 0; Count < argc; Count++)	8	for (Count = 1; Count < argc; Count++)
9	printf("arg %d: %s\n", Count, argv[Count]);	9	printf("arg %d: %s\n", Count, argv[Count]);
10		10
11	return 0;	11	return 0;

tests/tests2/31_args.expect+5−6

@@ -1,7 +1,6 @@
1	hello world 6	1	hello world 6
2	arg 0: 31_args.c	2	arg 1: arg1
3	arg 1: -	3	arg 2: arg2
4	arg 2: arg1	4	arg 3: arg3
5	arg 3: arg2	5	arg 4: arg4
6	arg 4: arg3	6	arg 5: arg5
7	arg 5: arg4

tests/tests2/Makefile+19−16

  27_sizeof.test \
  28_strings.test \
  29_array_address.test \
+ 30_hanoi.test \
  31_args.test \
  32_led.test \
  33_ternary_op.test \
+ 34_array_assignment.test \
  35_sizeof.test \
  36_array_initialisers.test \
  37_sprintf.test \
  43_void_param.test \
  44_scoped_declarations.test \
  45_empty_for.test \
+ 46_grep.test \
  47_switch_return.test \
  48_nested_break.test \
  49_bracket_evaluation.test \
 # 34_array_assignment.test -- array assignment is not in C standard
 # 46_grep.test -- does not compile even with gcc
+SKIP = 30_hanoi.test 34_array_assignment.test 46_grep.test
 # some tests do not pass on all platforms, remove them for now
 ifeq ($(TARGETOS),Darwin)
-  TESTS := $(filter-out 40_stdio.test,$(TESTS))
+ SKIP += 40_stdio.test
 endif
 ifdef CONFIG_WIN32
-  TESTS := $(filter-out 24_math_library.test 28_strings.test,$(TESTS))
+ SKIP += 24_math_library.test # don't have round()
+ SKIP += 28_strings.test # don't have r/index() / strings.h
 endif
+# Some tests might need arguments
+ARGS =
+31_args.test : ARGS = arg1 arg2 arg3 arg4 arg5
+all test: $(filter-out $(SKIP),$(TESTS))
 %.test: %.c %.expect
 	@echo Test: $*...
-	@if [ "x`echo $* | grep args`" != "x" ]; \
-	then $(TCC) $< -norunsrc -run $(notdir $<) - arg1 arg2 arg3 arg4 >$*.output 2>&1; \
-	else $(TCC) -run $< >$*.output 2>&1; \
-	  ($(TCC) -o $*.exe $< && ./$*.exe) >$*.output2 2>&1; \
-	fi || true
-	@if diff -bu $(<:.c=.expect) $*.output ; \
-	then rm -f $*.output; \
-	else exit 1; \
-	fi
-	@if test -f $*.output2; then if diff -bu $(<:.c=.expect) $*.output2 ; \
-	then rm -f $*.output2; \
-	else exit 1; \
-	fi; fi
-all test: $(TESTS)
+	@$(TCC) -run $< $(ARGS) >$*.output 2>&1 || true
+	@diff -bu $*.expect $*.output && rm -f $*.output
+	@($(TCC) $< -o $*.exe && ./$*.exe $(ARGS)) >$*.output2 2>&1 || true
+	@diff -bu $*.expect $*.output2 && rm -f $*.output2 $*.exe
 clean:
 	rm -vf fred.txt *.output* *.exe

tests2: cleanup

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code