Remove APLWC_MIN_MEM constant, and APLWC_MEM environment variable

FossilOrigin-Name: affcf2ab9c573820c77778abfb4769fad8a30ce457411b02a9528470994c7a6b

8 files changed, 10 insertions, 34 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3450d7..8d2a607 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,26 +113,6 @@ foreach(script ${TEST_SCRIPTS})
 	)
 endforeach()
 
-add_test(NAME "aplwc-repl-tiny" COMMAND "aplwc-repl" "-x")
-set_tests_properties("aplwc-repl-tiny" PROPERTIES
-	ENVIRONMENT "APLWC_MEM=16"
-	WILL_FAIL TRUE
-)
-
-add_test(NAME "aplwc-repl-large" COMMAND "aplwc-repl" "-x")
-set_tests_properties("aplwc-repl-large" PROPERTIES
-	ENVIRONMENT "APLWC_MEM=64000"
-)
-
-add_test(NAME "aplwc-repl-emptyvar" COMMAND "aplwc-repl" "-x")
-set_tests_properties("aplwc-repl-emptyvar" PROPERTIES
-	ENVIRONMENT "APLWC_MEM="
-)
-
-add_test(NAME "aplwc-repl-badvar" COMMAND "aplwc-repl" "-x")
-set_tests_properties("aplwc-repl-badvar" PROPERTIES
-	ENVIRONMENT "APLWC_MEM=1M"
-)
 
 add_test(NAME "aplwc-repl" COMMAND "aplwc-repl" "-x")
 
diff --git a/src/bin/main.c b/src/bin/main.c
index 572d170..fb75a9d 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -4,6 +4,8 @@
 #include <errno.h>
 #include "aplwc_repl.h"
 
+#define MEMSIZE 20000
+
 int
 main(int argc, char *argv[])
 {
@@ -13,7 +15,7 @@ main(int argc, char *argv[])
 	uint8_t *data;
 	char *input, *src;
 	int ret, exit_code, line_number;
-	size_t memsize, input_size, src_size, i;
+	size_t input_size, src_size, i;
 	int opt, xflag, input_file;
 	long tmp;
 	FILE *f;
@@ -50,15 +52,13 @@ usage:
 	else
 		goto usage;
 
-	memsize = getenv_ulong("APLWC_MEM", APLWC_MIN_MEM);
-
-	data = malloc(memsize);
+	data = malloc(MEMSIZE);
 	if(data == NULL){
 		fprintf(stderr, "Couldn't allocate memory\n");
 		return 1;
 	}
 
-	ret = aplwc_new(&aplwc, data, memsize);
+	ret = aplwc_new(&aplwc, data, MEMSIZE);
 	if(ret){
 		fprintf(stderr, "Couldn't create new aplwc instance: %s\n", aplwc_errstr_rc(ret));
 		free(data);
diff --git a/src/include/aplwc.h b/src/include/aplwc.h
index 3061500..ad640e4 100644
--- a/src/include/aplwc.h
+++ b/src/include/aplwc.h
@@ -30,6 +30,4 @@ void aplwc_free_value(struct aplwc_value *);
 const char *aplwc_value_string(struct aplwc_value *);
 enum aplwc_rc aplwc_load_module(struct aplwc *, const char *, const char *, int n);
 
-#define APLWC_MIN_MEM (64000)
-
 #endif /* APLWC_H */
diff --git a/tests/aplwc_errstr.c b/tests/aplwc_errstr.c
index 8014c1e..2ca14ab 100644
--- a/tests/aplwc_errstr.c
+++ b/tests/aplwc_errstr.c
@@ -4,7 +4,7 @@
 int
 main(void)
 {
-	uint8_t data[APLWC_MIN_MEM];
+	uint8_t data[20000];
 	struct aplwc *aplwc;
 	int ret;
 	const char *err;
diff --git a/tests/aplwc_eval.c b/tests/aplwc_eval.c
index 8f6abe0..c284189 100644
--- a/tests/aplwc_eval.c
+++ b/tests/aplwc_eval.c
@@ -5,7 +5,7 @@
 int
 main(int argc, char *argv[])
 {
-	uint8_t data[APLWC_MIN_MEM+1000];
+	uint8_t data[64000];
 	char *input;
 	struct aplwc *aplwc;
 	struct aplwc_line *line;
diff --git a/tests/aplwc_new.c b/tests/aplwc_new.c
index 8d57ecd..4ed893e 100644
--- a/tests/aplwc_new.c
+++ b/tests/aplwc_new.c
@@ -4,7 +4,7 @@ int
 main(void)
 {
 	struct aplwc *aplwc;
-	uint8_t data[APLWC_MIN_MEM*2];
+	uint8_t data[10000];
 	int ret;
 	size_t i, j;
 
@@ -15,8 +15,6 @@ main(void)
 			if(ret){
 				if(ret != APLWC_OUT_OF_MEMORY)
 					return 1;
-				if(j >= APLWC_MIN_MEM)
-					return 1;
 				break;
 			}
 		}
diff --git a/tests/aplwc_read.c b/tests/aplwc_read.c
index c54f598..8c5ce37 100644
--- a/tests/aplwc_read.c
+++ b/tests/aplwc_read.c
@@ -5,7 +5,7 @@
 int
 main(int argc, char *argv[])
 {
-	uint8_t data[APLWC_MIN_MEM+1000];
+	uint8_t data[20000];
 	char *input;
 	struct aplwc *aplwc;
 	struct aplwc_line *line;
diff --git a/tests/aplwc_utf8.c b/tests/aplwc_utf8.c
index b97b978..b950580 100644
--- a/tests/aplwc_utf8.c
+++ b/tests/aplwc_utf8.c
@@ -17,7 +17,7 @@ uint8_t good5[] = {0xef,0xbb,0xbf,0xf0,0xa3,0x8e,0xb4,0};
 int
 main(void)
 {
-	uint8_t data[APLWC_MIN_MEM+64000];
+	uint8_t data[64000];
 	struct aplwc *aplwc;
 	struct aplwc_line *line;
 	enum aplwc_rc ret;