[eros-cvs] cvs commit: eros/src/tutorial/triv-keeper imgmap

[shap@eros.cs.jhu.edu]

shap        01/11/28 20:55:48

  Modified:    src/base/tests/func test.mk
               src/base/tests/perf bench.mk
               src/tutorial tutorial.mk
               src/tutorial/triv-keeper imgmap
  Log:
  Touch ups to make regression test work again

Revision  Changes    Path
1.7       +2 -2      eros/src/base/tests/func/test.mk

Index: test.mk
===================================================================
RCS file: /cvs/eros/src/base/tests/func/test.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- test.mk	2001/11/28 20:21:27	1.6
+++ test.mk	2001/11/29 01:55:48	1.7
@@ -79,9 +79,9 @@
 
 $(BUILDDIR)/vmfloppy: $(BUILDDIR)/ztest.sysvol
 	dd if=/dev/zero of=$(BUILDDIR)/vmfloppy bs=1024 count=1440
-	dd if=ztest.sysvol of=$(BUILDDIR)/vmfloppy conv=notrunc
+	dd if=$(BUILDDIR)/ztest.sysvol of=$(BUILDDIR)/vmfloppy conv=notrunc
 
-vmware: $(BUILDDIR)/vmfloppy
+vmware: $(BUILDDIR) $(BUILDDIR)/vmfloppy
 	vmware -x -s floppy0.fileType=file -s floppy0.fileName=`pwd`/$(BUILDDIR)/vmfloppy $(HOME)/vmware/EROS/EROS.cfg
 
 # depend stuff



1.6       +1 -1      eros/src/base/tests/perf/bench.mk

Index: bench.mk
===================================================================
RCS file: /cvs/eros/src/base/tests/perf/bench.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bench.mk	2001/11/28 20:21:27	1.5
+++ bench.mk	2001/11/29 01:55:48	1.6
@@ -81,7 +81,7 @@
 	dd if=/dev/zero of=$(BUILDDIR)/vmfloppy bs=1024 count=1440
 	dd if=$(BUILDDIR)/ztest.sysvol of=$(BUILDDIR)/vmfloppy conv=notrunc
 
-vmware: $(BUILDDIR)/vmfloppy
+vmware: $(BUILDDIR) $(BUILDDIR)/vmfloppy
 	vmware -x -s floppy0.fileType=file -s floppy0.fileName=`pwd`/$(BUILDDIR)/vmfloppy $(HOME)/vmware/EROS/EROS.cfg
 
 # depend stuff



1.9       +2 -2      eros/src/tutorial/tutorial.mk

Index: tutorial.mk
===================================================================
RCS file: /cvs/eros/src/tutorial/tutorial.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tutorial.mk	2001/11/28 21:01:39	1.8
+++ tutorial.mk	2001/11/29 01:55:48	1.9
@@ -82,9 +82,9 @@
 
 $(BUILDDIR)/vmfloppy: $(BUILDDIR)/zsysvol
 	dd if=/dev/zero of=$(BUILDDIR)/vmfloppy bs=1024 count=1440
-	dd if=zsysvol of=$(BUILDDIR)/vmfloppy conv=notrunc
+	dd if=$(BUILDDIR)/zsysvol of=$(BUILDDIR)/vmfloppy conv=notrunc
 
-vmware: $(BUILDDIR)/vmfloppy
+vmware: $(BUILDDIR) $(BUILDDIR)/vmfloppy
 	vmware -x -s floppy0.fileType=file -s floppy0.fileName=`pwd`/$(BUILDDIR)/vmfloppy $(HOME)/vmware/EROS/EROS.cfg
 
 # depend stuff



1.6       +1 -1      eros/src/tutorial/triv-keeper/imgmap

Index: imgmap
===================================================================
RCS file: /cvs/eros/src/tutorial/triv-keeper/imgmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- imgmap	2001/11/28 21:01:39	1.5
+++ imgmap	2001/11/29 01:55:48	1.6
@@ -34,7 +34,7 @@
  * that.
  */
 trivkpr          = new process with constituents;
-trivkpr space    = small program BUILDIR "trivkpr";
+trivkpr space    = small program BUILDDIR "trivkpr";
 trivkpr pc       = symbol BUILDDIR "trivkpr" _start;
 trivkpr schedule = sched(8);	/* "normal" */