From 4bc4175eb078fd297c98d1bc88e57eaede0cf9e3 Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Mon, 5 Feb 2018 21:25:47 +0100 Subject: [PATCH] Bug 1435820 - [mozprocess] Remove unused C implemenation of proclaunch and all its support files. r=ahal Only test_mozprocess.py was still using the C implementation but is disabled since ages. Given that the proclaunch script as written in Python replaced the C implemenation lets remove all the old unused code. MozReview-Commit-ID: J4izHz5ljtO --HG-- extra : rebase_source : e33720aa3a6734fa3dd5fc082441ef54d515e75f --- testing/mozbase/mozprocess/tests/Makefile | 55 -- .../mozprocess/tests/iniparser/AUTHORS | 6 - .../mozprocess/tests/iniparser/INSTALL | 15 - .../mozprocess/tests/iniparser/LICENSE | 21 - .../mozprocess/tests/iniparser/Makefile | 85 --- .../mozbase/mozprocess/tests/iniparser/README | 12 - .../mozprocess/tests/iniparser/dictionary.c | 407 ----------- .../mozprocess/tests/iniparser/dictionary.h | 176 ----- .../mozprocess/tests/iniparser/iniparser.c | 648 ------------------ .../mozprocess/tests/iniparser/iniparser.h | 273 -------- .../mozprocess/tests/iniparser/platform.mk | 8 - testing/mozbase/mozprocess/tests/manifest.ini | 2 - .../tests/process_normal_finish.ini | 11 - .../mozprocess/tests/process_waittimeout.ini | 11 - .../tests/process_waittimeout_10s.ini | 8 - testing/mozbase/mozprocess/tests/proclaunch.c | 156 ----- .../mozprocess/tests/test_mozprocess.py | 239 ------- .../mozprocess/tests/test_mozprocess_misc.py | 24 +- .../tests/test_mozprocess_output.py | 14 + 19 files changed, 29 insertions(+), 2142 deletions(-) delete mode 100644 testing/mozbase/mozprocess/tests/Makefile delete mode 100644 testing/mozbase/mozprocess/tests/iniparser/AUTHORS delete mode 100644 testing/mozbase/mozprocess/tests/iniparser/INSTALL delete mode 100644 testing/mozbase/mozprocess/tests/iniparser/LICENSE delete mode 100644 testing/mozbase/mozprocess/tests/iniparser/Makefile delete mode 100644 testing/mozbase/mozprocess/tests/iniparser/README delete mode 100644 testing/mozbase/mozprocess/tests/iniparser/dictionary.c delete mode 100644 testing/mozbase/mozprocess/tests/iniparser/dictionary.h delete mode 100644 testing/mozbase/mozprocess/tests/iniparser/iniparser.c delete mode 100644 testing/mozbase/mozprocess/tests/iniparser/iniparser.h delete mode 100644 testing/mozbase/mozprocess/tests/iniparser/platform.mk delete mode 100644 testing/mozbase/mozprocess/tests/process_normal_finish.ini delete mode 100644 testing/mozbase/mozprocess/tests/process_waittimeout.ini delete mode 100644 testing/mozbase/mozprocess/tests/process_waittimeout_10s.ini delete mode 100644 testing/mozbase/mozprocess/tests/proclaunch.c delete mode 100644 testing/mozbase/mozprocess/tests/test_mozprocess.py diff --git a/testing/mozbase/mozprocess/tests/Makefile b/testing/mozbase/mozprocess/tests/Makefile deleted file mode 100644 index ea7163b00667..000000000000 --- a/testing/mozbase/mozprocess/tests/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# mozprocess proclaunch tests Makefile -# - -# include rules for platform determination -include iniparser/platform.mk - -ifeq ($(WIN32), 1) -# Win 32 -CC = cl -LINK = link -CFLAGS = //Od //I "iniparser" //D "WIN32" //D "_WIN32" //D "_DEBUG" //D "_CONSOLE" //D "_UNICODE" //D "UNICODE" //Gm //EHsc //RTC1 //MDd //W3 //nologo //c //ZI //TC -LFLAGS = //OUT:"proclaunch.exe" //INCREMENTAL //LIBPATH:"iniparser\\" //NOLOGO //DEBUG //SUBSYSTEM:CONSOLE //DYNAMICBASE //NXCOMPAT //ERRORREPORT:PROMPT iniparser.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib -RM = rm -f - -all: iniparser proclaunch - -iniparser: - $(MAKE) -C iniparser - -proclaunch.obj: proclaunch.c - @(echo "compiling proclaunch; platform: $(UNAME), WIN32: $(WIN32)") - $(CC) $(CFLAGS) proclaunch.c - -proclaunch: proclaunch.obj - $(LINK) $(LFLAGS) proclaunch.obj - -clean: - $(RM) proclaunch.exe proclaunch.obj -else -# *nix/Mac -LFLAGS = -L.. -liniparser -AR = ar -ARFLAGS = rcv -RM = rm -f -CC = gcc -ifeq ($(UNAME), Linux) -CFLAGS = -g -v -Iiniparser -else -CFLAGS = -g -v -arch i386 -Iiniparser -endif - -all: libiniparser.a proclaunch - -libiniparser.a: - $(MAKE) -C iniparser - -proclaunch: proclaunch.c - @(echo "compiling proclaunch; platform: $(UNAME), WIN32: $(WIN32)") - $(CC) $(CFLAGS) -o proclaunch proclaunch.c -Iiniparser -Liniparser -liniparser - -clean: - $(RM) proclaunch - $(MAKE) -C iniparser clean -endif diff --git a/testing/mozbase/mozprocess/tests/iniparser/AUTHORS b/testing/mozbase/mozprocess/tests/iniparser/AUTHORS deleted file mode 100644 index d5a3f6b2e33f..000000000000 --- a/testing/mozbase/mozprocess/tests/iniparser/AUTHORS +++ /dev/null @@ -1,6 +0,0 @@ -Author: Nicolas Devillard - -This tiny library has received countless contributions and I have -not kept track of all the people who contributed. Let them be thanked -for their ideas, code, suggestions, corrections, enhancements! - diff --git a/testing/mozbase/mozprocess/tests/iniparser/INSTALL b/testing/mozbase/mozprocess/tests/iniparser/INSTALL deleted file mode 100644 index a5b05d0e265e..000000000000 --- a/testing/mozbase/mozprocess/tests/iniparser/INSTALL +++ /dev/null @@ -1,15 +0,0 @@ - -iniParser installation instructions ------------------------------------ - -- Modify the Makefile to suit your environment. -- Type 'make' to make the library. -- Type 'make check' to make the test program. -- Type 'test/iniexample' to launch the test program. -- Type 'test/parse' to launch torture tests. - - - -Enjoy! -N. Devillard -Wed Mar 2 21:14:17 CET 2011 diff --git a/testing/mozbase/mozprocess/tests/iniparser/LICENSE b/testing/mozbase/mozprocess/tests/iniparser/LICENSE deleted file mode 100644 index 5a3a80babb7f..000000000000 --- a/testing/mozbase/mozprocess/tests/iniparser/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (c) 2000-2011 by Nicolas Devillard. -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - diff --git a/testing/mozbase/mozprocess/tests/iniparser/Makefile b/testing/mozbase/mozprocess/tests/iniparser/Makefile deleted file mode 100644 index 48c86f9d6afe..000000000000 --- a/testing/mozbase/mozprocess/tests/iniparser/Makefile +++ /dev/null @@ -1,85 +0,0 @@ -# -# iniparser Makefile -# - -# source files -SRCS = iniparser.c \ - dictionary.c - -# include rules for platform determination -include platform.mk - -# flags for the the various systems -ifeq ($(UNAME), Linux) - # Compiler settings - CC = gcc - AR = ar - ARFLAGS = rcv - SHLD = ${CC} ${CFLAGS} - CFLAGS = -O2 -fPIC -Wall -ansi -pedantic - LDSHFLAGS = -shared -Wl,-Bsymbolic -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib - LDFLAGS = -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib -endif -ifeq ($(UNAME), Darwin) - # Compiler settings - CC = gcc - # Ar settings to build the library - AR = ar - ARFLAGS = rcv - SHLD = libtool - CFLAGS = -v -arch i386 -fPIC -Wall -ansi -pedantic - LDFLAGS = -arch_only i386 -endif -ifeq ($(WIN32), 1) - CC = cl - CFLAGS = //Od //D "_WIN32" //D "WIN32" //D "_CONSOLE" //D "_CRT_SECURE_NO_WARNINGS" //D "_UNICODE" //D "UNICODE" //Gm //EHsc //RTC1 //MDd //W3 //nologo //c //ZI //TC - LDFLAGS = //OUT:"iniparser.lib" //NOLOGO - LINK = lib - RM = rm -f -endif - -# windows build rules -ifeq ($(WIN32), 1) - -COMPILE.c = $(CC) $(CFLAGS) -c -OBJS = $(SRCS:.c=.obj) - -all: iniparser.obj dictionary.obj iniparser.lib - -iniparser.obj: dictionary.obj - @($(CC) $(CFLAGS) iniparser.c) - -dictionary.obj: - @(echo "compiling dictionary; WIN32: $(WIN32); platform: $(UNAME)") - @($(CC) $(CFLAGS) dictionary.c) - -iniparser.lib: dictionary.obj iniparser.obj - @(echo "linking $(OBJS)") - @($(LINK) $(LDFLAGS) $(OBJS)) -else - -# *nix (and Mac) build rules -RM = rm -f -COMPILE.c = $(CC) $(CFLAGS) -c -OBJS = $(SRCS:.c=.o) - -all: libiniparser.a libiniparser.so - -.c.o: - @(echo "platform: $(UNAME), WIN32=$(WIN32); compiling $< ...") - @($(COMPILE.c) -o $@ $<) - -libiniparser.a: $(OBJS) - @($(AR) $(ARFLAGS) libiniparser.a $(OBJS)) - -ifeq ($(UNAME), Linux) -libiniparser.so: $(OBJS) - @$(SHLD) $(LDSHFLAGS) -o $@.0 $(OBJS) $(LDFLAGS) -else -libiniparser.so: $(OBJS) - @$(SHLD) -o $@.0 $(LDFLAGS) $(OBJS) -endif -endif - -clean: - $(RM) $(OBJS) libiniparser.* diff --git a/testing/mozbase/mozprocess/tests/iniparser/README b/testing/mozbase/mozprocess/tests/iniparser/README deleted file mode 100644 index af2a5c38fd0a..000000000000 --- a/testing/mozbase/mozprocess/tests/iniparser/README +++ /dev/null @@ -1,12 +0,0 @@ - -Welcome to iniParser -- version 3.0 -released 02 Mar 2011 - -This modules offers parsing of ini files from the C level. -See a complete documentation in HTML format, from this directory -open the file html/index.html with any HTML-capable browser. - -Enjoy! - -N.Devillard -Wed Mar 2 21:46:14 CET 2011 diff --git a/testing/mozbase/mozprocess/tests/iniparser/dictionary.c b/testing/mozbase/mozprocess/tests/iniparser/dictionary.c deleted file mode 100644 index 56da9a141209..000000000000 --- a/testing/mozbase/mozprocess/tests/iniparser/dictionary.c +++ /dev/null @@ -1,407 +0,0 @@ -/*-------------------------------------------------------------------------*/ -/** - @file dictionary.c - @author N. Devillard - @date Sep 2007 - @version $Revision: 1.27 $ - @brief Implements a dictionary for string variables. - - This module implements a simple dictionary object, i.e. a list - of string/string associations. This object is useful to store e.g. - informations retrieved from a configuration file (ini files). -*/ -/*--------------------------------------------------------------------------*/ - -/* - $Id: dictionary.c,v 1.27 2007-11-23 21:39:18 ndevilla Exp $ - $Revision: 1.27 $ -*/ -/*--------------------------------------------------------------------------- - Includes - ---------------------------------------------------------------------------*/ -#include "dictionary.h" - -#include -#include -#include -#ifndef _WIN32 -#include -#endif - -/** Maximum value size for integers and doubles. */ -#define MAXVALSZ 1024 - -/** Minimal allocated number of entries in a dictionary */ -#define DICTMINSZ 128 - -/** Invalid key token */ -#define DICT_INVALID_KEY ((char*)-1) - -/*--------------------------------------------------------------------------- - Private functions - ---------------------------------------------------------------------------*/ - -/* Doubles the allocated size associated to a pointer */ -/* 'size' is the current allocated size. */ -static void * mem_double(void * ptr, int size) -{ - void * newptr ; - - newptr = calloc(2*size, 1); - if (newptr==NULL) { - return NULL ; - } - memcpy(newptr, ptr, size); - free(ptr); - return newptr ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Duplicate a string - @param s String to duplicate - @return Pointer to a newly allocated string, to be freed with free() - - This is a replacement for strdup(). This implementation is provided - for systems that do not have it. - */ -/*--------------------------------------------------------------------------*/ -static char * xstrdup(char * s) -{ - char * t ; - if (!s) - return NULL ; - t = malloc(strlen(s)+1) ; - if (t) { - strcpy(t,s); - } - return t ; -} - -/*--------------------------------------------------------------------------- - Function codes - ---------------------------------------------------------------------------*/ -/*-------------------------------------------------------------------------*/ -/** - @brief Compute the hash key for a string. - @param key Character string to use for key. - @return 1 unsigned int on at least 32 bits. - - This hash function has been taken from an Article in Dr Dobbs Journal. - This is normally a collision-free function, distributing keys evenly. - The key is stored anyway in the struct so that collision can be avoided - by comparing the key itself in last resort. - */ -/*--------------------------------------------------------------------------*/ -unsigned dictionary_hash(char * key) -{ - int len ; - unsigned hash ; - int i ; - - len = strlen(key); - for (hash=0, i=0 ; i>6) ; - } - hash += (hash <<3); - hash ^= (hash >>11); - hash += (hash <<15); - return hash ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Create a new dictionary object. - @param size Optional initial size of the dictionary. - @return 1 newly allocated dictionary objet. - - This function allocates a new dictionary object of given size and returns - it. If you do not know in advance (roughly) the number of entries in the - dictionary, give size=0. - */ -/*--------------------------------------------------------------------------*/ -dictionary * dictionary_new(int size) -{ - dictionary * d ; - - /* If no size was specified, allocate space for DICTMINSZ */ - if (sizesize = size ; - d->val = (char **)calloc(size, sizeof(char*)); - d->key = (char **)calloc(size, sizeof(char*)); - d->hash = (unsigned int *)calloc(size, sizeof(unsigned)); - return d ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Delete a dictionary object - @param d dictionary object to deallocate. - @return void - - Deallocate a dictionary object and all memory associated to it. - */ -/*--------------------------------------------------------------------------*/ -void dictionary_del(dictionary * d) -{ - int i ; - - if (d==NULL) return ; - for (i=0 ; isize ; i++) { - if (d->key[i]!=NULL) - free(d->key[i]); - if (d->val[i]!=NULL) - free(d->val[i]); - } - free(d->val); - free(d->key); - free(d->hash); - free(d); - return ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Get a value from a dictionary. - @param d dictionary object to search. - @param key Key to look for in the dictionary. - @param def Default value to return if key not found. - @return 1 pointer to internally allocated character string. - - This function locates a key in a dictionary and returns a pointer to its - value, or the passed 'def' pointer if no such key can be found in - dictionary. The returned character pointer points to data internal to the - dictionary object, you should not try to free it or modify it. - */ -/*--------------------------------------------------------------------------*/ -char * dictionary_get(dictionary * d, char * key, char * def) -{ - unsigned hash ; - int i ; - - hash = dictionary_hash(key); - for (i=0 ; isize ; i++) { - if (d->key[i]==NULL) - continue ; - /* Compare hash */ - if (hash==d->hash[i]) { - /* Compare string, to avoid hash collisions */ - if (!strcmp(key, d->key[i])) { - return d->val[i] ; - } - } - } - return def ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Set a value in a dictionary. - @param d dictionary object to modify. - @param key Key to modify or add. - @param val Value to add. - @return int 0 if Ok, anything else otherwise - - If the given key is found in the dictionary, the associated value is - replaced by the provided one. If the key cannot be found in the - dictionary, it is added to it. - - It is Ok to provide a NULL value for val, but NULL values for the dictionary - or the key are considered as errors: the function will return immediately - in such a case. - - Notice that if you dictionary_set a variable to NULL, a call to - dictionary_get will return a NULL value: the variable will be found, and - its value (NULL) is returned. In other words, setting the variable - content to NULL is equivalent to deleting the variable from the - dictionary. It is not possible (in this implementation) to have a key in - the dictionary without value. - - This function returns non-zero in case of failure. - */ -/*--------------------------------------------------------------------------*/ -int dictionary_set(dictionary * d, char * key, char * val) -{ - int i ; - unsigned hash ; - - if (d==NULL || key==NULL) return -1 ; - - /* Compute hash for this key */ - hash = dictionary_hash(key) ; - /* Find if value is already in dictionary */ - if (d->n>0) { - for (i=0 ; isize ; i++) { - if (d->key[i]==NULL) - continue ; - if (hash==d->hash[i]) { /* Same hash value */ - if (!strcmp(key, d->key[i])) { /* Same key */ - /* Found a value: modify and return */ - if (d->val[i]!=NULL) - free(d->val[i]); - d->val[i] = val ? xstrdup(val) : NULL ; - /* Value has been modified: return */ - return 0 ; - } - } - } - } - /* Add a new value */ - /* See if dictionary needs to grow */ - if (d->n==d->size) { - - /* Reached maximum size: reallocate dictionary */ - d->val = (char **)mem_double(d->val, d->size * sizeof(char*)) ; - d->key = (char **)mem_double(d->key, d->size * sizeof(char*)) ; - d->hash = (unsigned int *)mem_double(d->hash, d->size * sizeof(unsigned)) ; - if ((d->val==NULL) || (d->key==NULL) || (d->hash==NULL)) { - /* Cannot grow dictionary */ - return -1 ; - } - /* Double size */ - d->size *= 2 ; - } - - /* Insert key in the first empty slot */ - for (i=0 ; isize ; i++) { - if (d->key[i]==NULL) { - /* Add key here */ - break ; - } - } - /* Copy key */ - d->key[i] = xstrdup(key); - d->val[i] = val ? xstrdup(val) : NULL ; - d->hash[i] = hash; - d->n ++ ; - return 0 ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Delete a key in a dictionary - @param d dictionary object to modify. - @param key Key to remove. - @return void - - This function deletes a key in a dictionary. Nothing is done if the - key cannot be found. - */ -/*--------------------------------------------------------------------------*/ -void dictionary_unset(dictionary * d, char * key) -{ - unsigned hash ; - int i ; - - if (key == NULL) { - return; - } - - hash = dictionary_hash(key); - for (i=0 ; isize ; i++) { - if (d->key[i]==NULL) - continue ; - /* Compare hash */ - if (hash==d->hash[i]) { - /* Compare string, to avoid hash collisions */ - if (!strcmp(key, d->key[i])) { - /* Found key */ - break ; - } - } - } - if (i>=d->size) - /* Key not found */ - return ; - - free(d->key[i]); - d->key[i] = NULL ; - if (d->val[i]!=NULL) { - free(d->val[i]); - d->val[i] = NULL ; - } - d->hash[i] = 0 ; - d->n -- ; - return ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Dump a dictionary to an opened file pointer. - @param d Dictionary to dump - @param f Opened file pointer. - @return void - - Dumps a dictionary onto an opened file pointer. Key pairs are printed out - as @c [Key]=[Value], one per line. It is Ok to provide stdout or stderr as - output file pointers. - */ -/*--------------------------------------------------------------------------*/ -void dictionary_dump(dictionary * d, FILE * out) -{ - int i ; - - if (d==NULL || out==NULL) return ; - if (d->n<1) { - fprintf(out, "empty dictionary\n"); - return ; - } - for (i=0 ; isize ; i++) { - if (d->key[i]) { - fprintf(out, "%20s\t[%s]\n", - d->key[i], - d->val[i] ? d->val[i] : "UNDEF"); - } - } - return ; -} - - -/* Test code */ -#ifdef TESTDIC -#define NVALS 20000 -int main(int argc, char *argv[]) -{ - dictionary * d ; - char * val ; - int i ; - char cval[90] ; - - /* Allocate dictionary */ - printf("allocating...\n"); - d = dictionary_new(0); - - /* Set values in dictionary */ - printf("setting %d values...\n", NVALS); - for (i=0 ; in != 0) { - printf("error deleting values\n"); - } - printf("deallocating...\n"); - dictionary_del(d); - return 0 ; -} -#endif -/* vim: set ts=4 et sw=4 tw=75 */ diff --git a/testing/mozbase/mozprocess/tests/iniparser/dictionary.h b/testing/mozbase/mozprocess/tests/iniparser/dictionary.h deleted file mode 100644 index e340a82d0dea..000000000000 --- a/testing/mozbase/mozprocess/tests/iniparser/dictionary.h +++ /dev/null @@ -1,176 +0,0 @@ - -/*-------------------------------------------------------------------------*/ -/** - @file dictionary.h - @author N. Devillard - @date Sep 2007 - @version $Revision: 1.12 $ - @brief Implements a dictionary for string variables. - - This module implements a simple dictionary object, i.e. a list - of string/string associations. This object is useful to store e.g. - informations retrieved from a configuration file (ini files). -*/ -/*--------------------------------------------------------------------------*/ - -/* - $Id: dictionary.h,v 1.12 2007-11-23 21:37:00 ndevilla Exp $ - $Author: ndevilla $ - $Date: 2007-11-23 21:37:00 $ - $Revision: 1.12 $ -*/ - -#ifndef _DICTIONARY_H_ -#define _DICTIONARY_H_ - -/*--------------------------------------------------------------------------- - Includes - ---------------------------------------------------------------------------*/ - -#include -#include -#include -#ifndef _WIN32 -#include -#endif - -/*--------------------------------------------------------------------------- - New types - ---------------------------------------------------------------------------*/ - - -/*-------------------------------------------------------------------------*/ -/** - @brief Dictionary object - - This object contains a list of string/string associations. Each - association is identified by a unique string key. Looking up values - in the dictionary is speeded up by the use of a (hopefully collision-free) - hash function. - */ -/*-------------------------------------------------------------------------*/ -typedef struct _dictionary_ { - int n ; /** Number of entries in dictionary */ - int size ; /** Storage size */ - char ** val ; /** List of string values */ - char ** key ; /** List of string keys */ - unsigned * hash ; /** List of hash values for keys */ -} dictionary ; - - -/*--------------------------------------------------------------------------- - Function prototypes - ---------------------------------------------------------------------------*/ - -/*-------------------------------------------------------------------------*/ -/** - @brief Compute the hash key for a string. - @param key Character string to use for key. - @return 1 unsigned int on at least 32 bits. - - This hash function has been taken from an Article in Dr Dobbs Journal. - This is normally a collision-free function, distributing keys evenly. - The key is stored anyway in the struct so that collision can be avoided - by comparing the key itself in last resort. - */ -/*--------------------------------------------------------------------------*/ -unsigned dictionary_hash(char * key); - -/*-------------------------------------------------------------------------*/ -/** - @brief Create a new dictionary object. - @param size Optional initial size of the dictionary. - @return 1 newly allocated dictionary objet. - - This function allocates a new dictionary object of given size and returns - it. If you do not know in advance (roughly) the number of entries in the - dictionary, give size=0. - */ -/*--------------------------------------------------------------------------*/ -dictionary * dictionary_new(int size); - -/*-------------------------------------------------------------------------*/ -/** - @brief Delete a dictionary object - @param d dictionary object to deallocate. - @return void - - Deallocate a dictionary object and all memory associated to it. - */ -/*--------------------------------------------------------------------------*/ -void dictionary_del(dictionary * vd); - -/*-------------------------------------------------------------------------*/ -/** - @brief Get a value from a dictionary. - @param d dictionary object to search. - @param key Key to look for in the dictionary. - @param def Default value to return if key not found. - @return 1 pointer to internally allocated character string. - - This function locates a key in a dictionary and returns a pointer to its - value, or the passed 'def' pointer if no such key can be found in - dictionary. The returned character pointer points to data internal to the - dictionary object, you should not try to free it or modify it. - */ -/*--------------------------------------------------------------------------*/ -char * dictionary_get(dictionary * d, char * key, char * def); - - -/*-------------------------------------------------------------------------*/ -/** - @brief Set a value in a dictionary. - @param d dictionary object to modify. - @param key Key to modify or add. - @param val Value to add. - @return int 0 if Ok, anything else otherwise - - If the given key is found in the dictionary, the associated value is - replaced by the provided one. If the key cannot be found in the - dictionary, it is added to it. - - It is Ok to provide a NULL value for val, but NULL values for the dictionary - or the key are considered as errors: the function will return immediately - in such a case. - - Notice that if you dictionary_set a variable to NULL, a call to - dictionary_get will return a NULL value: the variable will be found, and - its value (NULL) is returned. In other words, setting the variable - content to NULL is equivalent to deleting the variable from the - dictionary. It is not possible (in this implementation) to have a key in - the dictionary without value. - - This function returns non-zero in case of failure. - */ -/*--------------------------------------------------------------------------*/ -int dictionary_set(dictionary * vd, char * key, char * val); - -/*-------------------------------------------------------------------------*/ -/** - @brief Delete a key in a dictionary - @param d dictionary object to modify. - @param key Key to remove. - @return void - - This function deletes a key in a dictionary. Nothing is done if the - key cannot be found. - */ -/*--------------------------------------------------------------------------*/ -void dictionary_unset(dictionary * d, char * key); - - -/*-------------------------------------------------------------------------*/ -/** - @brief Dump a dictionary to an opened file pointer. - @param d Dictionary to dump - @param f Opened file pointer. - @return void - - Dumps a dictionary onto an opened file pointer. Key pairs are printed out - as @c [Key]=[Value], one per line. It is Ok to provide stdout or stderr as - output file pointers. - */ -/*--------------------------------------------------------------------------*/ -void dictionary_dump(dictionary * d, FILE * out); - -#endif diff --git a/testing/mozbase/mozprocess/tests/iniparser/iniparser.c b/testing/mozbase/mozprocess/tests/iniparser/iniparser.c deleted file mode 100644 index 64f9789988f2..000000000000 --- a/testing/mozbase/mozprocess/tests/iniparser/iniparser.c +++ /dev/null @@ -1,648 +0,0 @@ - -/*-------------------------------------------------------------------------*/ -/** - @file iniparser.c - @author N. Devillard - @date Sep 2007 - @version 3.0 - @brief Parser for ini files. -*/ -/*--------------------------------------------------------------------------*/ -/* - $Id: iniparser.c,v 2.19 2011-03-02 20:15:13 ndevilla Exp $ - $Revision: 2.19 $ - $Date: 2011-03-02 20:15:13 $ -*/ -/*---------------------------- Includes ------------------------------------*/ -#include -#include "iniparser.h" - -/*---------------------------- Defines -------------------------------------*/ -#define ASCIILINESZ (1024) -#define INI_INVALID_KEY ((char*)-1) - -/*--------------------------------------------------------------------------- - Private to this module - ---------------------------------------------------------------------------*/ -/** - * This enum stores the status for each parsed line (internal use only). - */ -typedef enum _line_status_ { - LINE_UNPROCESSED, - LINE_ERROR, - LINE_EMPTY, - LINE_COMMENT, - LINE_SECTION, - LINE_VALUE -} line_status ; - -/*-------------------------------------------------------------------------*/ -/** - @brief Convert a string to lowercase. - @param s String to convert. - @return ptr to statically allocated string. - - This function returns a pointer to a statically allocated string - containing a lowercased version of the input string. Do not free - or modify the returned string! Since the returned string is statically - allocated, it will be modified at each function call (not re-entrant). - */ -/*--------------------------------------------------------------------------*/ -static char * strlwc(char * s) -{ - static char l[ASCIILINESZ+1]; - int i ; - - if (s==NULL) return NULL ; - memset(l, 0, ASCIILINESZ+1); - i=0 ; - while (s[i] && i l) { - if (!isspace((int)*(last-1))) - break ; - last -- ; - } - *last = (char)0; - return (char*)l ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Get number of sections in a dictionary - @param d Dictionary to examine - @return int Number of sections found in dictionary - - This function returns the number of sections found in a dictionary. - The test to recognize sections is done on the string stored in the - dictionary: a section name is given as "section" whereas a key is - stored as "section:key", thus the test looks for entries that do not - contain a colon. - - This clearly fails in the case a section name contains a colon, but - this should simply be avoided. - - This function returns -1 in case of error. - */ -/*--------------------------------------------------------------------------*/ -int iniparser_getnsec(dictionary * d) -{ - int i ; - int nsec ; - - if (d==NULL) return -1 ; - nsec=0 ; - for (i=0 ; isize ; i++) { - if (d->key[i]==NULL) - continue ; - if (strchr(d->key[i], ':')==NULL) { - nsec ++ ; - } - } - return nsec ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Get name for section n in a dictionary. - @param d Dictionary to examine - @param n Section number (from 0 to nsec-1). - @return Pointer to char string - - This function locates the n-th section in a dictionary and returns - its name as a pointer to a string statically allocated inside the - dictionary. Do not free or modify the returned string! - - This function returns NULL in case of error. - */ -/*--------------------------------------------------------------------------*/ -char * iniparser_getsecname(dictionary * d, int n) -{ - int i ; - int foundsec ; - - if (d==NULL || n<0) return NULL ; - foundsec=0 ; - for (i=0 ; isize ; i++) { - if (d->key[i]==NULL) - continue ; - if (strchr(d->key[i], ':')==NULL) { - foundsec++ ; - if (foundsec>n) - break ; - } - } - if (foundsec<=n) { - return NULL ; - } - return d->key[i] ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Dump a dictionary to an opened file pointer. - @param d Dictionary to dump. - @param f Opened file pointer to dump to. - @return void - - This function prints out the contents of a dictionary, one element by - line, onto the provided file pointer. It is OK to specify @c stderr - or @c stdout as output files. This function is meant for debugging - purposes mostly. - */ -/*--------------------------------------------------------------------------*/ -void iniparser_dump(dictionary * d, FILE * f) -{ - int i ; - - if (d==NULL || f==NULL) return ; - for (i=0 ; isize ; i++) { - if (d->key[i]==NULL) - continue ; - if (d->val[i]!=NULL) { - fprintf(f, "[%s]=[%s]\n", d->key[i], d->val[i]); - } else { - fprintf(f, "[%s]=UNDEF\n", d->key[i]); - } - } - return ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Save a dictionary to a loadable ini file - @param d Dictionary to dump - @param f Opened file pointer to dump to - @return void - - This function dumps a given dictionary into a loadable ini file. - It is Ok to specify @c stderr or @c stdout as output files. - */ -/*--------------------------------------------------------------------------*/ -void iniparser_dump_ini(dictionary * d, FILE * f) -{ - int i, j ; - char keym[ASCIILINESZ+1]; - int nsec ; - char * secname ; - int seclen ; - - if (d==NULL || f==NULL) return ; - - nsec = iniparser_getnsec(d); - if (nsec<1) { - /* No section in file: dump all keys as they are */ - for (i=0 ; isize ; i++) { - if (d->key[i]==NULL) - continue ; - fprintf(f, "%s = %s\n", d->key[i], d->val[i]); - } - return ; - } - for (i=0 ; isize ; j++) { - if (d->key[j]==NULL) - continue ; - if (!strncmp(d->key[j], keym, seclen+1)) { - fprintf(f, - "%-30s = %s\n", - d->key[j]+seclen+1, - d->val[j] ? d->val[j] : ""); - } - } - } - fprintf(f, "\n"); - return ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Get the string associated to a key - @param d Dictionary to search - @param key Key string to look for - @param def Default value to return if key not found. - @return pointer to statically allocated character string - - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, - the pointer passed as 'def' is returned. - The returned char pointer is pointing to a string allocated in - the dictionary, do not free or modify it. - */ -/*--------------------------------------------------------------------------*/ -char * iniparser_getstring(dictionary * d, char * key, char * def) -{ - char * lc_key ; - char * sval ; - - if (d==NULL || key==NULL) - return def ; - - lc_key = strlwc(key); - sval = dictionary_get(d, lc_key, def); - return sval ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Get the string associated to a key, convert to an int - @param d Dictionary to search - @param key Key string to look for - @param notfound Value to return in case of error - @return integer - - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, - the notfound value is returned. - - Supported values for integers include the usual C notation - so decimal, octal (starting with 0) and hexadecimal (starting with 0x) - are supported. Examples: - - "42" -> 42 - "042" -> 34 (octal -> decimal) - "0x42" -> 66 (hexa -> decimal) - - Warning: the conversion may overflow in various ways. Conversion is - totally outsourced to strtol(), see the associated man page for overflow - handling. - - Credits: Thanks to A. Becker for suggesting strtol() - */ -/*--------------------------------------------------------------------------*/ -int iniparser_getint(dictionary * d, char * key, int notfound) -{ - char * str ; - - str = iniparser_getstring(d, key, INI_INVALID_KEY); - if (str==INI_INVALID_KEY) return notfound ; - return (int)strtol(str, NULL, 0); -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Get the string associated to a key, convert to a double - @param d Dictionary to search - @param key Key string to look for - @param notfound Value to return in case of error - @return double - - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, - the notfound value is returned. - */ -/*--------------------------------------------------------------------------*/ -double iniparser_getdouble(dictionary * d, char * key, double notfound) -{ - char * str ; - - str = iniparser_getstring(d, key, INI_INVALID_KEY); - if (str==INI_INVALID_KEY) return notfound ; - return atof(str); -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Get the string associated to a key, convert to a boolean - @param d Dictionary to search - @param key Key string to look for - @param notfound Value to return in case of error - @return integer - - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, - the notfound value is returned. - - A true boolean is found if one of the following is matched: - - - A string starting with 'y' - - A string starting with 'Y' - - A string starting with 't' - - A string starting with 'T' - - A string starting with '1' - - A false boolean is found if one of the following is matched: - - - A string starting with 'n' - - A string starting with 'N' - - A string starting with 'f' - - A string starting with 'F' - - A string starting with '0' - - The notfound value returned if no boolean is identified, does not - necessarily have to be 0 or 1. - */ -/*--------------------------------------------------------------------------*/ -int iniparser_getboolean(dictionary * d, char * key, int notfound) -{ - char * c ; - int ret ; - - c = iniparser_getstring(d, key, INI_INVALID_KEY); - if (c==INI_INVALID_KEY) return notfound ; - if (c[0]=='y' || c[0]=='Y' || c[0]=='1' || c[0]=='t' || c[0]=='T') { - ret = 1 ; - } else if (c[0]=='n' || c[0]=='N' || c[0]=='0' || c[0]=='f' || c[0]=='F') { - ret = 0 ; - } else { - ret = notfound ; - } - return ret; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Finds out if a given entry exists in a dictionary - @param ini Dictionary to search - @param entry Name of the entry to look for - @return integer 1 if entry exists, 0 otherwise - - Finds out if a given entry exists in the dictionary. Since sections - are stored as keys with NULL associated values, this is the only way - of querying for the presence of sections in a dictionary. - */ -/*--------------------------------------------------------------------------*/ -int iniparser_find_entry( - dictionary * ini, - char * entry -) -{ - int found=0 ; - if (iniparser_getstring(ini, entry, INI_INVALID_KEY)!=INI_INVALID_KEY) { - found = 1 ; - } - return found ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Set an entry in a dictionary. - @param ini Dictionary to modify. - @param entry Entry to modify (entry name) - @param val New value to associate to the entry. - @return int 0 if Ok, -1 otherwise. - - If the given entry can be found in the dictionary, it is modified to - contain the provided value. If it cannot be found, -1 is returned. - It is Ok to set val to NULL. - */ -/*--------------------------------------------------------------------------*/ -int iniparser_set(dictionary * ini, char * entry, char * val) -{ - return dictionary_set(ini, strlwc(entry), val) ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Delete an entry in a dictionary - @param ini Dictionary to modify - @param entry Entry to delete (entry name) - @return void - - If the given entry can be found, it is deleted from the dictionary. - */ -/*--------------------------------------------------------------------------*/ -void iniparser_unset(dictionary * ini, char * entry) -{ - dictionary_unset(ini, strlwc(entry)); -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Load a single line from an INI file - @param input_line Input line, may be concatenated multi-line input - @param section Output space to store section - @param key Output space to store key - @param value Output space to store value - @return line_status value - */ -/*--------------------------------------------------------------------------*/ -static line_status iniparser_line( - char * input_line, - char * section, - char * key, - char * value) -{ - line_status sta ; - char line[ASCIILINESZ+1]; - int len ; - - strcpy(line, strstrip(input_line)); - len = (int)strlen(line); - - sta = LINE_UNPROCESSED ; - if (len<1) { - /* Empty line */ - sta = LINE_EMPTY ; - } else if (line[0]=='#' || line[0]==';') { - /* Comment line */ - sta = LINE_COMMENT ; - } else if (line[0]=='[' && line[len-1]==']') { - /* Section name */ - sscanf(line, "[%[^]]", section); - strcpy(section, strstrip(section)); - strcpy(section, strlwc(section)); - sta = LINE_SECTION ; - } else if (sscanf (line, "%[^=] = \"%[^\"]\"", key, value) == 2 - || sscanf (line, "%[^=] = '%[^\']'", key, value) == 2 - || sscanf (line, "%[^=] = %[^;#]", key, value) == 2) { - /* Usual key=value, with or without comments */ - strcpy(key, strstrip(key)); - strcpy(key, strlwc(key)); - strcpy(value, strstrip(value)); - /* - * sscanf cannot handle '' or "" as empty values - * this is done here - */ - if (!strcmp(value, "\"\"") || (!strcmp(value, "''"))) { - value[0]=0 ; - } - sta = LINE_VALUE ; - } else if (sscanf(line, "%[^=] = %[;#]", key, value)==2 - || sscanf(line, "%[^=] %[=]", key, value) == 2) { - /* - * Special cases: - * key= - * key=; - * key=# - */ - strcpy(key, strstrip(key)); - strcpy(key, strlwc(key)); - value[0]=0 ; - sta = LINE_VALUE ; - } else { - /* Generate syntax error */ - sta = LINE_ERROR ; - } - return sta ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Parse an ini file and return an allocated dictionary object - @param ininame Name of the ini file to read. - @return Pointer to newly allocated dictionary - - This is the parser for ini files. This function is called, providing - the name of the file to be read. It returns a dictionary object that - should not be accessed directly, but through accessor functions - instead. - - The returned dictionary must be freed using iniparser_freedict(). - */ -/*--------------------------------------------------------------------------*/ -dictionary * iniparser_load(char * ininame) -{ - FILE * in ; - - char line [ASCIILINESZ+1] ; - char section [ASCIILINESZ+1] ; - char key [ASCIILINESZ+1] ; - char tmp [ASCIILINESZ+1] ; - char val [ASCIILINESZ+1] ; - - int last=0 ; - int len ; - int lineno=0 ; - int errs=0; - - dictionary * dict ; - - if ((in=fopen(ininame, "r"))==NULL) { - fprintf(stderr, "iniparser: cannot open %s\n", ininame); - return NULL ; - } - - dict = dictionary_new(0) ; - if (!dict) { - fclose(in); - return NULL ; - } - - memset(line, 0, ASCIILINESZ); - memset(section, 0, ASCIILINESZ); - memset(key, 0, ASCIILINESZ); - memset(val, 0, ASCIILINESZ); - last=0 ; - - while (fgets(line+last, ASCIILINESZ-last, in)!=NULL) { - lineno++ ; - len = (int)strlen(line)-1; - if (len==0) - continue; - /* Safety check against buffer overflows */ - if (line[len]!='\n') { - fprintf(stderr, - "iniparser: input line too long in %s (%d)\n", - ininame, - lineno); - dictionary_del(dict); - fclose(in); - return NULL ; - } - /* Get rid of \n and spaces at end of line */ - while ((len>=0) && - ((line[len]=='\n') || (isspace(line[len])))) { - line[len]=0 ; - len-- ; - } - /* Detect multi-line */ - if (line[len]=='\\') { - /* Multi-line value */ - last=len ; - continue ; - } else { - last=0 ; - } - switch (iniparser_line(line, section, key, val)) { - case LINE_EMPTY: - case LINE_COMMENT: - break ; - - case LINE_SECTION: - errs = dictionary_set(dict, section, NULL); - break ; - - case LINE_VALUE: - sprintf(tmp, "%s:%s", section, key); - errs = dictionary_set(dict, tmp, val) ; - break ; - - case LINE_ERROR: - fprintf(stderr, "iniparser: syntax error in %s (%d):\n", - ininame, - lineno); - fprintf(stderr, "-> %s\n", line); - errs++ ; - break; - - default: - break ; - } - memset(line, 0, ASCIILINESZ); - last=0; - if (errs<0) { - fprintf(stderr, "iniparser: memory allocation failure\n"); - break ; - } - } - if (errs) { - dictionary_del(dict); - dict = NULL ; - } - fclose(in); - return dict ; -} - -/*-------------------------------------------------------------------------*/ -/** - @brief Free all memory associated to an ini dictionary - @param d Dictionary to free - @return void - - Free all memory associated to an ini dictionary. - It is mandatory to call this function before the dictionary object - gets out of the current context. - */ -/*--------------------------------------------------------------------------*/ -void iniparser_freedict(dictionary * d) -{ - dictionary_del(d); -} - -/* vim: set ts=4 et sw=4 tw=75 */ diff --git a/testing/mozbase/mozprocess/tests/iniparser/iniparser.h b/testing/mozbase/mozprocess/tests/iniparser/iniparser.h deleted file mode 100644 index e3468b2c9736..000000000000 --- a/testing/mozbase/mozprocess/tests/iniparser/iniparser.h +++ /dev/null @@ -1,273 +0,0 @@ - -/*-------------------------------------------------------------------------*/ -/** - @file iniparser.h - @author N. Devillard - @date Sep 2007 - @version 3.0 - @brief Parser for ini files. -*/ -/*--------------------------------------------------------------------------*/ - -/* - $Id: iniparser.h,v 1.26 2011-03-02 20:15:13 ndevilla Exp $ - $Revision: 1.26 $ -*/ - -#ifndef _INIPARSER_H_ -#define _INIPARSER_H_ - -/*--------------------------------------------------------------------------- - Includes - ---------------------------------------------------------------------------*/ - -#include -#include -#include - -/* - * The following #include is necessary on many Unixes but not Linux. - * It is not needed for Windows platforms. - * Uncomment it if needed. - */ -/* #include */ - -#include "dictionary.h" - -/*-------------------------------------------------------------------------*/ -/** - @brief Get number of sections in a dictionary - @param d Dictionary to examine - @return int Number of sections found in dictionary - - This function returns the number of sections found in a dictionary. - The test to recognize sections is done on the string stored in the - dictionary: a section name is given as "section" whereas a key is - stored as "section:key", thus the test looks for entries that do not - contain a colon. - - This clearly fails in the case a section name contains a colon, but - this should simply be avoided. - - This function returns -1 in case of error. - */ -/*--------------------------------------------------------------------------*/ - -int iniparser_getnsec(dictionary * d); - - -/*-------------------------------------------------------------------------*/ -/** - @brief Get name for section n in a dictionary. - @param d Dictionary to examine - @param n Section number (from 0 to nsec-1). - @return Pointer to char string - - This function locates the n-th section in a dictionary and returns - its name as a pointer to a string statically allocated inside the - dictionary. Do not free or modify the returned string! - - This function returns NULL in case of error. - */ -/*--------------------------------------------------------------------------*/ - -char * iniparser_getsecname(dictionary * d, int n); - - -/*-------------------------------------------------------------------------*/ -/** - @brief Save a dictionary to a loadable ini file - @param d Dictionary to dump - @param f Opened file pointer to dump to - @return void - - This function dumps a given dictionary into a loadable ini file. - It is Ok to specify @c stderr or @c stdout as output files. - */ -/*--------------------------------------------------------------------------*/ - -void iniparser_dump_ini(dictionary * d, FILE * f); - -/*-------------------------------------------------------------------------*/ -/** - @brief Dump a dictionary to an opened file pointer. - @param d Dictionary to dump. - @param f Opened file pointer to dump to. - @return void - - This function prints out the contents of a dictionary, one element by - line, onto the provided file pointer. It is OK to specify @c stderr - or @c stdout as output files. This function is meant for debugging - purposes mostly. - */ -/*--------------------------------------------------------------------------*/ -void iniparser_dump(dictionary * d, FILE * f); - -/*-------------------------------------------------------------------------*/ -/** - @brief Get the string associated to a key - @param d Dictionary to search - @param key Key string to look for - @param def Default value to return if key not found. - @return pointer to statically allocated character string - - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, - the pointer passed as 'def' is returned. - The returned char pointer is pointing to a string allocated in - the dictionary, do not free or modify it. - */ -/*--------------------------------------------------------------------------*/ -char * iniparser_getstring(dictionary * d, char * key, char * def); - -/*-------------------------------------------------------------------------*/ -/** - @brief Get the string associated to a key, convert to an int - @param d Dictionary to search - @param key Key string to look for - @param notfound Value to return in case of error - @return integer - - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, - the notfound value is returned. - - Supported values for integers include the usual C notation - so decimal, octal (starting with 0) and hexadecimal (starting with 0x) - are supported. Examples: - - - "42" -> 42 - - "042" -> 34 (octal -> decimal) - - "0x42" -> 66 (hexa -> decimal) - - Warning: the conversion may overflow in various ways. Conversion is - totally outsourced to strtol(), see the associated man page for overflow - handling. - - Credits: Thanks to A. Becker for suggesting strtol() - */ -/*--------------------------------------------------------------------------*/ -int iniparser_getint(dictionary * d, char * key, int notfound); - -/*-------------------------------------------------------------------------*/ -/** - @brief Get the string associated to a key, convert to a double - @param d Dictionary to search - @param key Key string to look for - @param notfound Value to return in case of error - @return double - - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, - the notfound value is returned. - */ -/*--------------------------------------------------------------------------*/ -double iniparser_getdouble(dictionary * d, char * key, double notfound); - -/*-------------------------------------------------------------------------*/ -/** - @brief Get the string associated to a key, convert to a boolean - @param d Dictionary to search - @param key Key string to look for - @param notfound Value to return in case of error - @return integer - - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, - the notfound value is returned. - - A true boolean is found if one of the following is matched: - - - A string starting with 'y' - - A string starting with 'Y' - - A string starting with 't' - - A string starting with 'T' - - A string starting with '1' - - A false boolean is found if one of the following is matched: - - - A string starting with 'n' - - A string starting with 'N' - - A string starting with 'f' - - A string starting with 'F' - - A string starting with '0' - - The notfound value returned if no boolean is identified, does not - necessarily have to be 0 or 1. - */ -/*--------------------------------------------------------------------------*/ -int iniparser_getboolean(dictionary * d, char * key, int notfound); - - -/*-------------------------------------------------------------------------*/ -/** - @brief Set an entry in a dictionary. - @param ini Dictionary to modify. - @param entry Entry to modify (entry name) - @param val New value to associate to the entry. - @return int 0 if Ok, -1 otherwise. - - If the given entry can be found in the dictionary, it is modified to - contain the provided value. If it cannot be found, -1 is returned. - It is Ok to set val to NULL. - */ -/*--------------------------------------------------------------------------*/ -int iniparser_set(dictionary * ini, char * entry, char * val); - - -/*-------------------------------------------------------------------------*/ -/** - @brief Delete an entry in a dictionary - @param ini Dictionary to modify - @param entry Entry to delete (entry name) - @return void - - If the given entry can be found, it is deleted from the dictionary. - */ -/*--------------------------------------------------------------------------*/ -void iniparser_unset(dictionary * ini, char * entry); - -/*-------------------------------------------------------------------------*/ -/** - @brief Finds out if a given entry exists in a dictionary - @param ini Dictionary to search - @param entry Name of the entry to look for - @return integer 1 if entry exists, 0 otherwise - - Finds out if a given entry exists in the dictionary. Since sections - are stored as keys with NULL associated values, this is the only way - of querying for the presence of sections in a dictionary. - */ -/*--------------------------------------------------------------------------*/ -int iniparser_find_entry(dictionary * ini, char * entry) ; - -/*-------------------------------------------------------------------------*/ -/** - @brief Parse an ini file and return an allocated dictionary object - @param ininame Name of the ini file to read. - @return Pointer to newly allocated dictionary - - This is the parser for ini files. This function is called, providing - the name of the file to be read. It returns a dictionary object that - should not be accessed directly, but through accessor functions - instead. - - The returned dictionary must be freed using iniparser_freedict(). - */ -/*--------------------------------------------------------------------------*/ -dictionary * iniparser_load(char * ininame); - -/*-------------------------------------------------------------------------*/ -/** - @brief Free all memory associated to an ini dictionary - @param d Dictionary to free - @return void - - Free all memory associated to an ini dictionary. - It is mandatory to call this function before the dictionary object - gets out of the current context. - */ -/*--------------------------------------------------------------------------*/ -void iniparser_freedict(dictionary * d); - -#endif diff --git a/testing/mozbase/mozprocess/tests/iniparser/platform.mk b/testing/mozbase/mozprocess/tests/iniparser/platform.mk deleted file mode 100644 index bff0296fe1d6..000000000000 --- a/testing/mozbase/mozprocess/tests/iniparser/platform.mk +++ /dev/null @@ -1,8 +0,0 @@ -# System platform - -# determine if windows -WIN32 := 0 -UNAME := $(shell uname -s) -ifneq (,$(findstring MINGW32_NT,$(UNAME))) -WIN32 = 1 -endif diff --git a/testing/mozbase/mozprocess/tests/manifest.ini b/testing/mozbase/mozprocess/tests/manifest.ini index 818b9ed49d61..144c9a923158 100644 --- a/testing/mozbase/mozprocess/tests/manifest.ini +++ b/testing/mozbase/mozprocess/tests/manifest.ini @@ -6,8 +6,6 @@ skip-if = (os == "win") subsuite = mozbase, os == "linux" -[test_mozprocess.py] -disabled = bug 877864 [test_mozprocess_kill.py] [test_mozprocess_misc.py] [test_mozprocess_poll.py] diff --git a/testing/mozbase/mozprocess/tests/process_normal_finish.ini b/testing/mozbase/mozprocess/tests/process_normal_finish.ini deleted file mode 100644 index c4468de49e00..000000000000 --- a/testing/mozbase/mozprocess/tests/process_normal_finish.ini +++ /dev/null @@ -1,11 +0,0 @@ -[main] -children=c1,c2 -maxtime=60 - -[c1] -children=2 -maxtime=60 - -[c2] -children=0 -maxtime=30 diff --git a/testing/mozbase/mozprocess/tests/process_waittimeout.ini b/testing/mozbase/mozprocess/tests/process_waittimeout.ini deleted file mode 100644 index 77cbf2e39ba4..000000000000 --- a/testing/mozbase/mozprocess/tests/process_waittimeout.ini +++ /dev/null @@ -1,11 +0,0 @@ -[main] -children=c1,c2 -maxtime=300 - -[c1] -children=2 -maxtime=300 - -[c2] -children=3 -maxtime=300 diff --git a/testing/mozbase/mozprocess/tests/process_waittimeout_10s.ini b/testing/mozbase/mozprocess/tests/process_waittimeout_10s.ini deleted file mode 100644 index 59d2d76fff3c..000000000000 --- a/testing/mozbase/mozprocess/tests/process_waittimeout_10s.ini +++ /dev/null @@ -1,8 +0,0 @@ -[main] -children=c1 -maxtime=10 - -[c1] -children=2 -maxtime=5 - diff --git a/testing/mozbase/mozprocess/tests/proclaunch.c b/testing/mozbase/mozprocess/tests/proclaunch.c deleted file mode 100644 index 9762831f3fb4..000000000000 --- a/testing/mozbase/mozprocess/tests/proclaunch.c +++ /dev/null @@ -1,156 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include -#include -#include "iniparser.h" - -#ifdef _WIN32 -#include -#include - -extern int iniparser_getint(dictionary *d, char *key, int notfound); -extern char *iniparser_getstring(dictionary *d, char *key, char *def); - -// This is the windows launcher function -int launchWindows(int children, int maxtime) { - _TCHAR cmdline[50]; - STARTUPINFO startup; - PROCESS_INFORMATION procinfo; - BOOL rv = 0; - - _stprintf(cmdline, _T("proclaunch.exe %d %d"), children, maxtime); - ZeroMemory(&startup, sizeof(STARTUPINFO)); - startup.cb = sizeof(STARTUPINFO); - - ZeroMemory(&procinfo, sizeof(PROCESS_INFORMATION)); - - printf("Launching process!\n"); - rv = CreateProcess(NULL, - cmdline, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &startup, - &procinfo); - - if (!rv) { - DWORD dw = GetLastError(); - printf("error: %d\n", dw); - } - CloseHandle(procinfo.hProcess); - CloseHandle(procinfo.hThread); - return 0; -} -#endif - -int main(int argc, char **argv) { - int children = 0; - int maxtime = 0; - int passedtime = 0; - dictionary *dict = NULL; - - // Command line handling - if (argc == 1 || (0 == strcmp(argv[1], "-h")) || (0 == strcmp(argv[1], "--help"))) { - printf("ProcLauncher takes an ini file. Specify the ini file as the only\n"); - printf("parameter of the command line:\n"); - printf("proclauncher my.ini\n\n"); - printf("The ini file has the form:\n"); - printf("[main]\n"); - printf("children=child1,child2 ; These comma separated values are sections\n"); - printf("maxtime=60 ; Max time this process lives\n"); - printf("[child1] ; Here is a child section\n"); - printf("children=3 ; You can have grandchildren: this spawns 3 of them for child1\n"); - printf("maxtime=30 ; Max time, note it's in seconds. If this time\n"); - printf(" ; is > main:maxtime then the child process will be\n"); - printf(" ; killed when the parent exits. Also, grandchildren\n"); - printf("[child2] ; inherit this maxtime and can't change it.\n"); - printf("maxtime=25 ; You can call these sections whatever you want\n"); - printf("children=0 ; as long as you reference them in a children attribute\n"); - printf("....\n"); - return 0; - } else if (argc == 2) { - // This is ini file mode: - // proclauncher - dict = iniparser_load(argv[1]); - - } else if (argc == 3) { - // Then we've been called in child process launching mode: - // proclauncher - children = atoi(argv[1]); - maxtime = atoi(argv[2]); - } - - if (dict) { - /* Dict operation */ - char *childlist = iniparser_getstring(dict, "main:children", NULL); - maxtime = iniparser_getint(dict, (char*)"main:maxtime", 10);; - if (childlist) { - int c = 0, m = 10; - char childkey[50], maxkey[50]; - char cmd[25]; - char *token = strtok(childlist, ","); - - while (token) { - // Reset defaults - memset(childkey, 0, 50); - memset(maxkey, 0, 50); - memset(cmd, 0, 25); - c = 0; - m = 10; - - sprintf(childkey, "%s:children", token); - sprintf(maxkey, "%s:maxtime", token); - c = iniparser_getint(dict, childkey, 0); - m = iniparser_getint(dict, maxkey, 10); - - // Launch the child process - #ifdef _WIN32 - launchWindows(c, m); - #else - sprintf(cmd, "./proclaunch %d %d &", c, m); - system(cmd); - #endif - - // Get the next child entry - token = strtok(NULL, ","); - } - } - iniparser_freedict(dict); - } else { - // Child Process operation - put on your recursive thinking cap - char cmd[25]; - // This is launching grandchildren, there are no great grandchildren, so we - // pass in a 0 for the children to spawn. - #ifdef _WIN32 - while(children > 0) { - launchWindows(0, maxtime); - children--; - } - #else - sprintf(cmd, "./proclaunch %d %d &", 0, maxtime); - printf("Launching child process: %s\n", cmd); - while (children > 0) { - system(cmd); - children--; - } - #endif - } - - /* Now we have launched all the children. Let's wait for max time before returning - This does pseudo busy waiting just to appear active */ - while (passedtime < maxtime) { -#ifdef _WIN32 - Sleep(1000); -#else - sleep(1); -#endif - passedtime++; - } - exit(0); - return 0; -} diff --git a/testing/mozbase/mozprocess/tests/test_mozprocess.py b/testing/mozbase/mozprocess/tests/test_mozprocess.py deleted file mode 100644 index 802a03418576..000000000000 --- a/testing/mozbase/mozprocess/tests/test_mozprocess.py +++ /dev/null @@ -1,239 +0,0 @@ -#!/usr/bin/env python - -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. - -from __future__ import absolute_import, print_function - -import os -import subprocess -import sys -import proctest - -import mozunit - -from mozprocess import processhandler - -here = os.path.dirname(os.path.abspath(__file__)) - - -def make_proclaunch(aDir): - """ - Makes the proclaunch executable. - Params: - aDir - the directory in which to issue the make commands - Returns: - the path to the proclaunch executable that is generated - """ - - if sys.platform == "win32": - exepath = os.path.join(aDir, "proclaunch.exe") - else: - exepath = os.path.join(aDir, "proclaunch") - - # remove the launcher, if it already exists - # otherwise, if the make fails you may not notice - if os.path.exists(exepath): - os.remove(exepath) - - # Ideally make should take care of both calls through recursion, but since it doesn't, - # on windows anyway (to file?), let's just call out both targets explicitly. - for command in [["make", "-C", "iniparser"], - ["make"]]: - process = subprocess.Popen(command, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, cwd=aDir) - stdout, stderr = process.communicate() - if process.returncode: - # SomethingBadHappen; print all the things - print("%s: exit %d" % (command, process.returncode)) - print("stdout:\n%s" % stdout) - print("stderr:\n%s" % stderr) - raise subprocess.CalledProcessError(process.returncode, command, stdout) - - # ensure the launcher now exists - if not os.path.exists(exepath): - raise AssertionError("proclaunch executable '%s' " - "does not exist (sys.platform=%s)" % (exepath, sys.platform)) - return exepath - - -class ProcTest(proctest.ProcTest): - - # whether to remove created files on exit - cleanup = os.environ.get('CLEANUP', 'true').lower() in ('1', 'true') - - @classmethod - def setUpClass(cls): - cls.proclaunch = make_proclaunch(here) - - @classmethod - def tearDownClass(cls): - del cls.proclaunch - if not cls.cleanup: - return - files = [('proclaunch',), - ('proclaunch.exe',), - ('iniparser', 'dictionary.o'), - ('iniparser', 'iniparser.lib'), - ('iniparser', 'iniparser.o'), - ('iniparser', 'libiniparser.a'), - ('iniparser', 'libiniparser.so.0'), - ] - files = [os.path.join(here, *path) for path in files] - errors = [] - for path in files: - if os.path.exists(path): - try: - os.remove(path) - except OSError as e: - errors.append(str(e)) - if errors: - raise OSError("Error(s) encountered tearing down " - "%s.%s:\n%s" % (cls.__module__, cls.__name__, '\n'.join(errors))) - - def test_process_normal_finish(self): - """Process is started, runs to completion while we wait for it""" - - p = processhandler.ProcessHandler([self.proclaunch, "process_normal_finish.ini"], - cwd=here) - p.run() - p.wait() - - self.determine_status(p) - - def test_commandline_no_args(self): - """Command line is reported correctly when no arguments are specified""" - p = processhandler.ProcessHandler(self.proclaunch, cwd=here) - self.assertEqual(p.commandline, self.proclaunch) - - def test_commandline_overspecified(self): - """Command line raises an exception when the arguments are specified ambiguously""" - err = None - try: - processhandler.ProcessHandler([self.proclaunch, "process_normal_finish.ini"], - args=["1", "2", "3"], - cwd=here) - except TypeError as e: - err = e - - self.assertTrue(err) - - def test_commandline_from_list(self): - """Command line is reported correctly when command and arguments are specified in a list""" - p = processhandler.ProcessHandler([self.proclaunch, "process_normal_finish.ini"], - cwd=here) - self.assertEqual(p.commandline, self.proclaunch + ' process_normal_finish.ini') - - def test_commandline_over_specified(self): - """Command line raises an exception when the arguments are specified ambiguously""" - err = None - try: - processhandler.ProcessHandler([self.proclaunch, "process_normal_finish.ini"], - args=["1", "2", "3"], - cwd=here) - except TypeError as e: - err = e - - self.assertTrue(err) - - def test_commandline_from_args(self): - """Command line is reported correctly when arguments are specified in a dedicated list""" - p = processhandler.ProcessHandler(self.proclaunch, - args=["1", "2", "3"], - cwd=here) - self.assertEqual(p.commandline, self.proclaunch + ' 1 2 3') - - def test_process_wait(self): - """Process is started runs to completion while we wait indefinitely""" - - p = processhandler.ProcessHandler([self.proclaunch, - "process_waittimeout_10s.ini"], - cwd=here) - p.run() - p.wait() - - self.determine_status(p) - - def test_process_timeout(self): - """ Process is started, runs but we time out waiting on it - to complete - """ - p = processhandler.ProcessHandler([self.proclaunch, "process_waittimeout.ini"], - cwd=here) - p.run(timeout=10) - p.wait() - - self.determine_status(p, False, ['returncode', 'didtimeout']) - - def test_process_timeout_no_kill(self): - """ Process is started, runs but we time out waiting on it - to complete. Process should not be killed. - """ - p = None - - def timeout_handler(): - self.assertEqual(p.proc.poll(), None) - p.kill() - p = processhandler.ProcessHandler([self.proclaunch, "process_waittimeout.ini"], - cwd=here, - onTimeout=(timeout_handler,), - kill_on_timeout=False) - p.run(timeout=1) - p.wait() - self.assertTrue(p.didTimeout) - - self.determine_status(p, False, ['returncode', 'didtimeout']) - - def test_process_waittimeout(self): - """ - Process is started, then wait is called and times out. - Process is still running and didn't timeout - """ - p = processhandler.ProcessHandler([self.proclaunch, - "process_waittimeout_10s.ini"], - cwd=here) - - p.run() - p.wait(timeout=5) - - self.determine_status(p, True, ()) - - def test_process_waitnotimeout(self): - """ Process is started, runs to completion before our wait times out - """ - p = processhandler.ProcessHandler([self.proclaunch, - "process_waittimeout_10s.ini"], - cwd=here) - p.run(timeout=30) - p.wait() - - self.determine_status(p) - - def test_process_kill(self): - """Process is started, we kill it""" - - p = processhandler.ProcessHandler([self.proclaunch, "process_normal_finish.ini"], - cwd=here) - p.run() - p.kill() - - self.determine_status(p) - - def test_process_output_twice(self): - """ - Process is started, then processOutput is called a second time explicitly - """ - p = processhandler.ProcessHandler([self.proclaunch, - "process_waittimeout_10s.ini"], - cwd=here) - - p.run() - p.processOutput(timeout=5) - p.wait() - - self.determine_status(p, False, ()) - - -if __name__ == '__main__': - mozunit.main() diff --git a/testing/mozbase/mozprocess/tests/test_mozprocess_misc.py b/testing/mozbase/mozprocess/tests/test_mozprocess_misc.py index 50df21dbf830..16bb897da043 100644 --- a/testing/mozbase/mozprocess/tests/test_mozprocess_misc.py +++ b/testing/mozbase/mozprocess/tests/test_mozprocess_misc.py @@ -16,19 +16,25 @@ here = os.path.dirname(os.path.abspath(__file__)) class ProcTestMisc(proctest.ProcTest): """ Class to test misc operations """ - def test_process_output_twice(self): - """ - Process is started, then processOutput is called a second time explicitly + def test_process_timeout_no_kill(self): + """ Process is started, runs but we time out waiting on it + to complete. Process should not be killed. """ + p = None + + def timeout_handler(): + self.assertEqual(p.proc.poll(), None) + p.kill() p = processhandler.ProcessHandler([self.python, self.proclaunch, - "process_waittimeout_10s_python.ini"], - cwd=here) - - p.run() - p.processOutput(timeout=5) + "process_waittimeout_python.ini"], + cwd=here, + onTimeout=(timeout_handler,), + kill_on_timeout=False) + p.run(timeout=1) p.wait() + self.assertTrue(p.didTimeout) - self.determine_status(p, False, ()) + self.determine_status(p, False, ['returncode', 'didtimeout']) def test_unicode_in_environment(self): env = { diff --git a/testing/mozbase/mozprocess/tests/test_mozprocess_output.py b/testing/mozbase/mozprocess/tests/test_mozprocess_output.py index b5d07eb88075..4291132b91c1 100644 --- a/testing/mozbase/mozprocess/tests/test_mozprocess_output.py +++ b/testing/mozbase/mozprocess/tests/test_mozprocess_output.py @@ -16,6 +16,20 @@ here = os.path.dirname(os.path.abspath(__file__)) class ProcTestOutput(proctest.ProcTest): """ Class to test operations related to output handling """ + def test_process_output_twice(self): + """ + Process is started, then processOutput is called a second time explicitly + """ + p = processhandler.ProcessHandler([self.python, self.proclaunch, + "process_waittimeout_10s_python.ini"], + cwd=here) + + p.run() + p.processOutput(timeout=5) + p.wait() + + self.determine_status(p, False, ()) + def test_process_output_nonewline(self): """ Process is started, outputs data with no newline