Run linux examples in Travis (#668)

* Update makefile; add a list target for testing

* simplify nostdlib example

* Make sendmail example return success

* Add tests to run all examples

* Add some targets to exclude

* Run example scripts; temporarily add a workspace accsesor to mcore

* Optionally read end of main from argv

* Make concolic test more robust

* Clean up Makefile

* Be better with phony targets

* Add run_simple and state_control tests

* verbosity++

* Make sure we fail when we intend to

* Simplify travis_test.sh

* Remove multi_arch_sym

examples/linux/Makefile

@@ -1,55 +1,33 @@
 CC=gcc
 CFLAGS=-O3 -static
+NOSTDLIBFLAGS=-fno-builtin -static -nostdlib -fomit-frame-pointer
 
-all: CFLAGS=-O3 -static 
-all: NOSTDLIBFLAGS=-m32 -fno-builtin -static -nostdlib  -fomit-frame-pointer
-all: nostdlib  basic  sindex  strncmp  arguments ibranch sendmail crackme indexhell baby-re helloworld simpleassert
+EXAMPLES=basic sindex  strncmp  arguments ibranch sendmail crackme indexhell  helloworld simple_copy simpleassert
+OTHER_EXAMPLES=nostdlib
+
+all: $(EXAMPLES) $(OTHER_EXAMPLES) 
 
 arm: CC=arm-linux-gnueabi-gcc
-arm: basic  sindex  strncmp  arguments ibranch sendmail crackme indexhell helloworld simple_copy simpleassert
+arm: $(EXAMPLES)
+
+.PHONY: list clean
+list:
+	@echo $(EXAMPLES)
 
 clean:
-		rm -rf nostdlib  basic  sindex strncmp arguments sendmail server ibranch crackme indexhell crackme.c simple_copy helloworld nostdlib32 nostdlib64
+	rm -rf $(EXAMPLES) $(OTHER_EXAMPLES) crackme.c
 
-nostdlib: nostdlib.c
-		$(CC) -m32 -fno-builtin -static -nostdlib  -fomit-frame-pointer  nostdlib.c  -o nostdlib32
-		$(CC) -m32 -fno-builtin -static -nostdlib  -fomit-frame-pointer  nostdlib.c  -o nostdlib64
+% : %.c
+	$(CC) $(CFLAGS) $< -o $@
 
-helloworld: helloworld.c
-		$(CC) $(CFLAGS) $< -static -o $@
-
-simple_copy: simple_copy.c
-		$(CC) $(CFLAGS) simple_copy.c -static -o simple_copy
-basic: basic.c
-		$(CC) $(CFLAGS) basic.c -static -o basic
+nostdlib: nostdlib.c 
+	$(CC) -m32 $(NOSTDLIBFLAGS) $< -o $@
 
+# simpleassert needs -O0
 simpleassert: simpleassert.c
-		$(CC) $(CFLAGS) -O0 simpleassert.c -static -o simpleassert
+	$(CC) $(CFLAGS) -O0 $< -o $@
 
-sindex: sindex.c
-		$(CC) $(CFLAGS) sindex.c -o sindex
+# crackme needs to be generated
+crackme.c: crackme.py
+	python crackme.py > $@
 
-ibranch: ibranch.c
-		$(CC) $(CFLAGS) ibranch.c -o ibranch
-
-strncmp: strncmp.c
-		$(CC) $(CFLAGS) strncmp.c -o strncmp
-
-arguments: arguments.c
-		$(CC) $(CFLAGS) arguments.c  -o arguments
-
-sendmail: sendmail.c
-		gcc -static sendmail.c -o sendmail
-
-server: server.c
-		gcc -static server.c -o server
-
-crackme: crackme.py 
-	python crackme.py  >crackme.c
-	gcc -static -Os crackme.c -o crackme
-
-indexhell: indexhell.c
-	gcc -static indexhell.c -o indexhell
-
-baby-re: baby-re.c
-	$(CC) $(CFLAGS) -o $@ $< -Wno-unused-result

examples/linux/nostdlib.c

@@ -19,36 +19,34 @@
         arg 6           %ebp         call-saved
 */
 static inline
-int syscall(int syscall_number, ... )  {
+int syscall(int syscall_number, int arg1, int arg2, int arg3)  {
     int ret;
     asm volatile (
         "pushl %%ebp\n\t"
         "movl %1, %%eax\n\t"
-        "movl %2, %%ebx\n\t"
-        "movl %3, %%ecx\n\t"
-        "movl %4, %%edx\n\t"
-        "movl %5, %%edi\n\t"
-        "movl %6, %%esi\n\t"
-        "movl %7, %%ebp\n\t"
+        "movl %2, %%eax\n\t"
+        "movl %3, %%ebx\n\t"
+        "movl %4, %%ecx\n\t"
+        //"movl %4, %%edx\n\t"
         "int $0x80\n\t"
         "popl %%ebp\n\t"
         : "=a"(ret)
-        : "g"(syscall_number), "g"(*(&syscall_number+1)), "g"(*(&syscall_number+2)), "g"(*(&syscall_number+3)), "g"(*(&syscall_number+4)), "g"(*(&syscall_number+5)), "g"(*(&syscall_number+6))
+        : "g"(syscall_number), "g"(arg1), "g"(arg2), "g"(arg3)
         : "%ebx", "%ecx", "%edx", "%esi", "%edi"
     );
 return ret;
 }
 
 int write(int fd, void* buffer, unsigned int size){
-    return syscall(4, fd, buffer, size,0,0,0);
+    return syscall(4, fd, (int) buffer, size);
 }
 
 int read(int fd, void* buffer, unsigned int size){
-    return syscall(3, fd, buffer, size,0,0,0);
+    return syscall(3, fd, (int) buffer, size);
 }
 
 int exit(int errorlevel){
-    return syscall(1, errorlevel,0,0,0,0,0);
+    return syscall(1, errorlevel,0,0);
 }
 
 void _start(){

examples/linux/sendmail.c

@@ -62,4 +62,5 @@ main(int argc, char argv[]){
 char buffer[200];
 read(0,buffer,200);
 copy_it(buffer, 200);
+return 0;
 }