Index: cpushare-0.47/Makefile
===================================================================
--- cpushare-0.47.orig/Makefile	2008-04-06 22:25:23.000000000 +0000
+++ cpushare-0.47/Makefile	2008-04-06 22:25:24.000000000 +0000
@@ -47,7 +47,7 @@
 seccomp-loader: seccomp-loader.c seccomp-loader.h
 	$(CC) $(CFLAGS) $< -o $@
 
-seccomp_test: seccomp-loader bytecode.text.bin bytecode.data.bin bytecode-malicious.text.bin bytecode-malicious.data.bin
+seccomp_test: seccomp-loader bytecode-safe.text.bin bytecode-safe.data.bin bytecode-malicious.text.bin bytecode-malicious.data.bin
 
 PROJECTS = $(filter-out projects/CVS,$(wildcard projects/*))
 
@@ -59,7 +59,7 @@
 
 cpushare: seccomp-loader seccomp_test $(patsubst %, _build_%, $(PROJECTS))
 
-bytecode.o: bytecode.c seccomp-loader.h
+bytecode-safe.o: bytecode.c seccomp-loader.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 bytecode-malicious.o: bytecode.c seccomp-loader.h
@@ -71,16 +71,16 @@
 bytecode.lds: bytecode.lds.s
 	grep -A100000000 SECTION $< > $@
 
-bytecode: bytecode.o bytecode.lds
+bytecode-safe: bytecode-safe.o bytecode.lds
 	$(LD) $(LDFLAGS) -static -T bytecode.lds $< --start-group $(LIBGCC) $(LIBC) $(LIBM) --end-group -o $@
 
 bytecode-malicious: bytecode-malicious.o bytecode.lds
 	$(LD) $(LDFLAGS) -static -T bytecode.lds $< --start-group $(LIBGCC) $(LIBC) $(LIBM) --end-group -o $@
 
-bytecode.text.bin: bytecode
+bytecode-safe.text.bin: bytecode-safe
 	$(OBJCOPY) -O binary $< -j .text $@
 
-bytecode.data.bin: bytecode
+bytecode-safe.data.bin: bytecode-safe
 	$(OBJCOPY) -O binary $< -j .data $@
 
 bytecode-malicious.text.bin: bytecode-malicious
@@ -90,7 +90,7 @@
 	$(OBJCOPY) -O binary $< -j .data $@
 
 clean: $(patsubst %, _clean_%, $(PROJECTS))
-	-rm -r *.o seccomp-loader bytecode bytecode-malicious bytecode.lds bytecode.lds.s \
+	-rm -r *.o seccomp-loader bytecode-safe bytecode-malicious bytecode.lds bytecode.lds.s \
 	*~ *.{text,data,seccomp}.bin *.pyc cpushare.tap cpushare-*.log* cpushare-*.pid cache/* \
 	twisted/plugins/dropin.cache twisted/plugins/*.pyc
 
Index: cpushare-0.47/seccomp_test.py
===================================================================
--- cpushare-0.47.orig/seccomp_test.py	2008-04-06 22:25:23.000000000 +0000
+++ cpushare-0.47/seccomp_test.py	2008-04-06 22:25:48.000000000 +0000
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # seccomp_test: test seccomp with bytecode
 # Copyright (C) 2004-2006  Andrea Arcangeli <andrea@cpushare.com>
 #
@@ -26,11 +27,11 @@
 class seccomp_loader_class(object):
 	def __init__(self, heap_size, stack_size, home, bytecode):
 		print 'init'
-		self.popen3 = popen2.Popen3((os.path.join(home, 'seccomp-loader'),))
+		self.popen3 = popen2.Popen3(('/usr/lib/cpushare/seccomp-loader',))
 		if self.popen3.childerr != None:
 			raise Exception('x')
 
-		seccomp_gen_obj = seccomp_gen_class(os.path.join(home, bytecode))
+		seccomp_gen_obj = seccomp_gen_class('/usr/lib/cpushare/' + bytecode)
 		self.obj = seccomp_gen_obj._build_header(heap_size, stack_size) + seccomp_gen_obj.text_data
 
 	def load(self):
@@ -77,14 +78,14 @@
 	def stop(self):
 		print 'stop'
 		os.kill(self.popen3.pid, signal.SIGQUIT)
-		# give it 10 seconds to call exit
+		# give it 1 seconds to call exit
 		# this wait is not really necessary
 		# this is only to test that the task can call
 		# exit successfully too
 		# sending a SIGTERM stright away would be just fine
 		# SIGCHLD will wake us up so we're not really
-		# going to wait 10 sec
-		time.sleep(10)
+		# going to wait 1 sec
+		time.sleep(1)
 
 	def kill(self):
 		print 'kill'
@@ -112,7 +113,7 @@
 		signal.signal(signal.SIGCHLD, sigchld_handler)
 		try:
 			seccomp_loader.start()
-			time.sleep(10) # 10 seconds of computations
+			time.sleep(1) # 1 seconds of computations
 			seccomp_loader.stop()
 		except ChildIsGone:
 			pass
@@ -142,16 +143,17 @@
 def build():
 	global HOME
 	HOME = os.path.join(os.getcwd(), os.path.dirname(sys.argv[0]))
+	return
 
 	if os.system('cd %s && make seccomp_test' % HOME):
 		print '`make` executable has failed'
 		sys.exit(1)
 
 def seccomp_test():
-	system_check()
+	#system_check()
 
 	print 'Starting computing some safe bytecode'
-	error = seccomp_load('bytecode')
+	error = seccomp_load('bytecode-safe')
 	if error:
 		if error == 15 << 8:
 			print 'FAILURE: please recompile the Linux Kernel with CONFIG_SECCOMP=y'