Makefile changes to compile any generated workload in a directory

Makefile

@@ -10,6 +10,12 @@ all: $(SUBDIRS)
 tests:
 	$(MAKE) -C $(CODEDIR) tests
 
+seq1:
+	$(MAKE) -C $(CODEDIR) seq1
+
+gentests:
+	$(MAKE) -C $(CODEDIR) gentests
+
 permuters:
 	$(MAKE) -C $(CODEDIR) permuters
 

ace/ace.py

@@ -1133,7 +1133,7 @@ def doPermutation(perm):
         usedFiles = flatList(set(usedFiles))
 
         #For lower sequences, let's allow fsync on any related file - sibling/parent
-        if int(num_ops) < 3:
+        if int(num_ops) < 3 and not demo:
             syncPermutationsCustom = buildCustomTuple(file_range(usedFiles))
         else:
             syncPermutationsCustom = buildCustomTuple(usedFiles)
@@ -1315,14 +1315,15 @@ def main():
         OperationSet = ['link','falloc']
         FallocOptions = ['FALLOC_FL_ZERO_RANGE|FALLOC_FL_KEEP_SIZE']
         FileOptions = ['A/foo']
-        SecondFileOptions = ['A/bar']
+        SecondFileOptions = ['B/bar']
 
     else:
         demo = False
 
     # In case the user requests for an additional level of nesting, add one nested dir A/C and one file within it A/C/foo.
     if nested:
         FileOptions = FileOptions + ['AC/foo']
+	SecondFileOptions = SecondFileOptions + ['AC/bar']
         SecondDirOptions = SecondDirOptions + ['AC']
 
     # We just print all known bugs

code/Makefile

@@ -81,8 +81,15 @@ CM_SEQ1_OUT = \
 		$(foreach TEST, $(CM_SEQ1), \
 			$(BUILD_DIR)/tests/seq1/$(TEST))
 
-CM_TESTS_EXCLUDE = BaseTestCase.cpp
-CM_TESTS = \
+
+CM_GEN_EXCLUDE = base.cpp
+CM_GEN = \
+		$(patsubst %.cpp, %.so, \
+			$(filter-out $(CM_GEN_EXCLUDE), \
+					$(notdir $(wildcard $(CURDIR)/tests/generated_workloads/*.cpp))))
+CM_GEN_OUT = \
+		$(foreach TEST, $(CM_GEN), \
+			$(BUILD_DIR)/tests/generated_workloads/$(TEST))
 
 
 CM_TESTS_EXCLUDE = BaseTestCase.cpp
@@ -109,6 +116,7 @@ all: \
 		c_harness \
 		user_tools \
 		tests \
+		seq1 \
 		permuters
 
 modules: \
@@ -127,9 +135,14 @@ user_tools: \
 
 tests: \
 		$(foreach TEST, $(CM_TESTS), $(BUILD_DIR)/tests/$(TEST)) \
-		$(CM_GEN_042_OUT) \
+		$(CM_GEN_042_OUT) 
+
+seq1: \
 		$(CM_SEQ1_OUT)
 
+gentests: \
+		$(CM_GEN_OUT)
+
 permuters: \
 		$(foreach PERMUTER, $(CM_PERMUTERS), $(BUILD_DIR)/permuter/$(PERMUTER))
 
@@ -181,6 +194,12 @@ $(BUILD_DIR)/tests/seq1/%.o: %.cpp
 	mkdir -p $(@D)
 	$(GPP) $(GOPTS) -fPIC -c -o $@ $<
 
+
+$(BUILD_DIR)/tests/generated_workloads/%.o: %.cpp
+	mkdir -p $(@D)
+	$(GPP) $(GOPTS) -fPIC -c -o $@ $<
+
+
 # For static pattern rules like the one below, the pattern and prereqs must be
 # separated by ' :' including the space!
 $(CM_GEN_042_OUT): $(BUILD_DIR)/tests/generic_042/%.so : \
@@ -215,6 +234,23 @@ $(CM_SEQ1_OUT): $(BUILD_DIR)/tests/seq1/%.so : \
 	$(GPP) $(GOPTS) $(GOTPSSO) $(XATTR_DEF_FLAG) -Wl,-soname,$(notdir $@) \
 		-o $@ $^
 
+
+$(CM_GEN_OUT): $(BUILD_DIR)/tests/generated_workloads/%.so : \
+		tests/generated_workloads/%.cpp \
+		$(BUILD_DIR)/tests/BaseTestCase.o \
+		$(BUILD_DIR)/user_tools/src/actions.o \
+		$(BUILD_DIR)/user_tools/src/wrapper.o \
+		$(BUILD_DIR)/user_tools/src/workload.o \
+		$(BUILD_DIR)/utils/DiskMod.o \
+		$(BUILD_DIR)/utils/communication/BaseSocket.o \
+		$(BUILD_DIR)/utils/communication/ClientSocket.o \
+		$(BUILD_DIR)/utils/communication/ClientCommandSender.o \
+		$(BUILD_DIR)/results/DataTestResult.o
+	mkdir -p $(@D)
+	$(GPP) $(GOPTS) $(GOTPSSO) $(XATTR_DEF_FLAG) -Wl,-soname,$(notdir $@) \
+		-o $@ $^
+
+
 $(BUILD_DIR)/tests/%.so: \
 		tests/%.cpp \
 		$(BUILD_DIR)/tests/BaseTestCase.o \

code/tests/ace-base/base-j-lang

@@ -3,6 +3,8 @@ test
 A
 A/C
 B
+foo
+bar
 A/foo
 A/bar
 B/foo
@@ -13,4 +15,4 @@ A/C/bar
 # declare
 local_checkpoint
 
-# setup
+# setup