GSI update to allow single letter hostnames.

Bump test configuration for clean VM install. Bump version for release.
steve-o · Aug 31, 2020 · cd3456a · cd3456a
1 parent e2ff9cf
commit cd3456a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/openpgm/pgm/SConstruct b/openpgm/pgm/SConstruct
@@ -88,9 +88,9 @@ env = Environment(
 		],
 	LIBS = [
 		],
-	PROTOBUF_CCFLAGS = '-I/miru/projects/protobuf/protobuf-2.3.0/gcc64/include',
-	PROTOBUF_LIBS = '/miru/projects/protobuf/protobuf-2.3.0/gcc64/lib/libprotobuf.a',
-	PROTOBUF_PROTOC = '/miru/projects/protobuf/protobuf-2.3.0/gcc64/bin/protoc'
+	PROTOBUF_CCFLAGS = '-I/home/steve-o/protobuf/include',
+	PROTOBUF_LIBS = '/home/steve-o/protobuf/lib/libprotobuf.a',
+	PROTOBUF_PROTOC = '/home/steve-o/protobuf/bin/protoc'
 )
 
 # Branch prediction

diff --git a/openpgm/pgm/gsi.c b/openpgm/pgm/gsi.c
@@ -48,7 +48,7 @@ pgm_gsi_create_from_data (
 {
 	pgm_return_val_if_fail (NULL != gsi, FALSE);
 	pgm_return_val_if_fail (NULL != data, FALSE);
-	pgm_return_val_if_fail (length > 1, FALSE);
+	pgm_return_val_if_fail (length > 0, FALSE);
 
 	struct pgm_md5_t ctx;
 	char resblock[16];

diff --git a/openpgm/pgm/test/test.conf.pl b/openpgm/pgm/test/test.conf.pl
@@ -4,29 +4,29 @@
 %config = (
 	app => {
 # Linux host
-#		host	=> 'ayaka',
-#		ip	=> '10.6.28.31',
-#		cmd	=> 'sudo /miru/projects/openpgm/pgm/ref/release-Linux-x86_64/test/app',
-#		network => 'eth0;239.192.0.1'
+		host	=> 'a',
+		ip	=> '192.168.0.1',
+		cmd	=> 'sudo /home/steve-o/openpgm/openpgm/pgm/ref/release-Linux-x86_64/test/app',
+		network => '192.168.0;239.192.0.1'
 # Solaris host
-		host	=> 'ryoko',
-		ip	=> '10.6.28.36',
-		cmd	=> 'sudo LD_LIBRARY_PATH=/opt/glib-sunstudio/lib:$LD_LIBRARY_PATH /miru/projects/openpgm/pgm/ref/release-SunOS-sun4u-sunstudio/test/app',
-		network => 'eri0;239.192.0.1'
+#		host	=> 'ryoko',
+#		ip	=> '10.6.28.36',
+#		cmd	=> 'sudo LD_LIBRARY_PATH=/opt/glib-sunstudio/lib:$LD_LIBRARY_PATH /miru/projects/openpgm/pgm/ref/release-SunOS-sun4u-sunstudio/test/app',
+#		network => 'eri0;239.192.0.1'
 # Windows host
 #		host	=> 'Administrator@sora',
 #		ip	=> '10.6.28.35',
 #		cmd	=> '/cygdrive/c/temp/app.exe',
 #		network	=> '10.6.28.35;239.192.0.1'
 	},
 	mon => {
-		host	=> 'momo',
-		cmd	=> 'sudo /miru/projects/openpgm/pgm/ref/release-FreeBSD-amd64/test/monitor',
-		network => 'bge0;239.192.0.1'
+		host	=> 'c',
+		cmd	=> 'sudo /home/steve-o/openpgm/openpgm/pgm/ref/release-Linux-x86_64/test/monitor',
+		network => '192.168.0;239.192.0.1'
 	},
 	sim => {
-		host	=> 'kiku',
-		cmd	=> 'sudo /miru/projects/openpgm/pgm/ref/release-Linux-x86_64/test/sim',
-		network => 'eth0;239.192.0.1'
+		host	=> 'b',
+		cmd	=> 'sudo /home/steve-o/openpgm/openpgm/pgm/ref/release-Linux-x86_64/test/sim',
+		network => '192.168.0;239.192.0.1'
 	},
 );
diff --git a/openpgm/pgm/version_generator.py b/openpgm/pgm/version_generator.py
@@ -46,8 +46,8 @@
 /* globals */
 
 const unsigned pgm_major_version = 5;
-const unsigned pgm_minor_version = 2;
-const unsigned pgm_micro_version = 127;
+const unsigned pgm_minor_version = 3;
+const unsigned pgm_micro_version = 128;
 const char* pgm_build_date = "{0}";
 const char* pgm_build_time = "{1}";
 const char* pgm_build_system = "{2}";